From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:52460 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968414AbdEXPHl (ORCPT ); Wed, 24 May 2017 11:07:41 -0400 Date: Wed, 24 May 2017 17:07:30 +0200 From: Greg KH To: Arnd Bergmann Cc: stable@vger.kernel.org Subject: Re: [PATCH] [stable 3.18] fix __unflatten_device_tree warning Message-ID: <20170524150730.GA26296@kroah.com> References: <20170524143001.1678102-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170524143001.1678102-1-arnd@arndb.de> Sender: stable-owner@vger.kernel.org List-ID: 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 > --- > 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