of: fdt: Fix return with value in void function
authorBen Hutchings <ben@decadent.org.uk>
Mon, 26 Feb 2018 16:32:31 +0000 (16:32 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 3 Mar 2018 15:51:03 +0000 (15:51 +0000)
Commit 49e67dd17649 "of: fdt: add missing allocation-failure check"
added a "return NULL" statement in __unflatten_device_tree().  When
applied to the 3.2-stable branch, this introduced a compiler warning
(not an error!) because the function returns void here.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/of/fdt.c

index 29f121e..a84c03c 100644 (file)
@@ -389,7 +389,7 @@ static void __unflatten_device_tree(struct boot_param_header *blob,
        mem = (unsigned long)
                dt_alloc(size + 4, __alignof__(struct device_node));
        if (!mem)
-               return NULL;
+               return;
 
        memset((void *)mem, 0, size);