diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2017-08-23 16:32:32 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2017-10-02 15:16:27 +0200 |
| commit | 4105f395fd8ef4b76cc6442d7f184c0b12976721 (patch) | |
| tree | 3ee27a6041de0580a89fac9cf0a0d41af55195ee | |
| parent | 4b20a89fc6b70a809feae01bd2e7658997c0016b (diff) | |
of: fdt: fix compiler warning
Backport 78de28c67 introduced the following compiler warning. The
later function prototype was changed to return a void* while
in 4.1 the function does not return a value.
drivers/of/fdt.c: In function '__unflatten_device_tree':
include/linux/stddef.h:8:14: warning: 'return' with a value, in function returning void
#define NULL ((void *)0)
^
drivers/of/fdt.c:416:10: note: in expansion of macro 'NULL'
return NULL;
^~~~
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Stefan Agner <stefan.agner@toradex.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); |