From 30f7430b476f98e1aa553450b440466f1606aae8 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 26 Feb 2018 16:32:31 +0000 Subject: [PATCH] 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 --- drivers/of/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 29f121e9345b3..a84c03c7b00ca 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); -- 2.47.2