* [PATCH] [stable 3.18] fix __unflatten_device_tree warning
@ 2017-05-24 14:30 Arnd Bergmann
2017-05-24 15:07 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2017-05-24 14:30 UTC (permalink / raw)
To: gregkh; +Cc: stable, Arnd Bergmann
A backported patch needs to be modified for a context change
drivers/of/fdt.c:384:10: warning: 'return' with a value, in function returning void
Fixes: 0aa459efa045 ("of: fdt: add missing allocation-failure check")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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 e706bced9b6b..74c7aba476f6 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);
--
2.9.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [stable 3.18] fix __unflatten_device_tree warning
2017-05-24 14:30 [PATCH] [stable 3.18] fix __unflatten_device_tree warning Arnd Bergmann
@ 2017-05-24 15:07 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2017-05-24 15:07 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: stable
On Wed, May 24, 2017 at 04:30:01PM +0200, Arnd Bergmann wrote:
> A backported patch needs to be modified for a context change
>
> drivers/of/fdt.c:384:10: warning: 'return' with a value, in function returning void
>
> Fixes: 0aa459efa045 ("of: fdt: add missing allocation-failure check")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> 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 e706bced9b6b..74c7aba476f6 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);
>
Ah, this is still in a patch that I have not released yet, nice! I've
now flattened this with the original one, many thanks for it.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-24 15:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-24 14:30 [PATCH] [stable 3.18] fix __unflatten_device_tree warning Arnd Bergmann
2017-05-24 15:07 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.