summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2018-02-26 16:32:31 +0000
committerBen Hutchings <ben@decadent.org.uk>2018-03-03 15:51:03 +0000
commit30f7430b476f98e1aa553450b440466f1606aae8 (patch)
tree1ddfc4407477a7cff757b80b7bf4f2baa2373607 /drivers
parent0294ef89b68f8c59df0be0fd5ecf20aa34d29741 (diff)
downloadlinux-30f7430b476f98e1aa553450b440466f1606aae8.tar.gz
linux-30f7430b476f98e1aa553450b440466f1606aae8.tar.bz2
linux-30f7430b476f98e1aa553450b440466f1606aae8.zip
of: fdt: Fix return with value in void function
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/of/fdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 29f121e9345b..a84c03c7b00c 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -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);