diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2017-09-18 17:51:36 -0700 |
---|---|---|
committer | Sasha Levin <alexander.levin@verizon.com> | 2017-10-05 20:43:19 -0400 |
commit | 6a4a1817e990e0a2d63edd88aae17b625533ae89 (patch) | |
tree | b3c53fe37fc33c70e337a28ba98f4aa209fb57f2 | |
parent | a60e407b961e818541ff7924afa8e51fbdb21a61 (diff) |
of: fdt: Fix return value in __unflatten_device_tree()
Commit 78de28c67c8f ("of: fdt: add missing allocation-failure check")
would make us return NULL in a function declared to return void as of
the 4.1 kernel.
Fixes: 78de28c67c8f ("of: fdt: add missing allocation-failure check")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-rw-r--r-- | drivers/of/fdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index bf89754fe973..308a95ead432 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -413,7 +413,7 @@ static void __unflatten_device_tree(void *blob, /* Allocate memory for the expanded device tree */ mem = dt_alloc(size + 4, __alignof__(struct device_node)); if (!mem) - return NULL; + return; memset(mem, 0, size); |