diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2018-02-26 16:32:31 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-03-03 15:52:29 +0000 |
| commit | 52f0b4f11aab0854fc31b83296d816d3d78c0892 (patch) | |
| tree | 04d56fcb291e322fbba733fea84938640b0b2659 | |
| parent | 491b0fc4001bc7fd2383e6587b623a7506d93e66 (diff) | |
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.16-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>
| -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 ff01ee27130d..4159ae251ffc 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -381,7 +381,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); |