From patchwork Wed May 24 14:30:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 100441 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp304428qge; Wed, 24 May 2017 07:30:17 -0700 (PDT) X-Received: by 10.98.36.198 with SMTP id k67mr39649411pfk.174.1495636216953; Wed, 24 May 2017 07:30:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495636216; cv=none; d=google.com; s=arc-20160816; b=EgAiqf5PNixUJ0Hnuf2xHNopjTUYqbtrtJsyNHi2LXJ/BJoXvEkUnLZ5rh2+FVd8MZ Mrlt8fxFH87hpzxCKUCwbkFfaqH2vivE1hr7Kk20QUQvPeXHgPEUmgAx8WvPk8h8Jrv/ jAk3lpMSK/bygUtk4+7lHJieYjYF108eD3LcfRSMkxYwR7IZQ/BW4DwAxT8n9CBZuygz HotWqWdzDiGlGHMGjfQ3B+2zuQwoogJzlj9lvnpVE46MKouzTALcC0mqVgCTLTPoJKHP NWuUNuDGx1xgIo4V6fP4OjKzLkScLfPtqkpjmOSx5dYxgKnMsByvMcRq/go6KXs20+E5 3mNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=M/z8JLQrYSyALrQ0mFS3nGacVCHFmC9cC69SSy9/yKs=; b=I92E07fC78eY3PPDM+imzlEhtp8/WD99OO6WuTzteHe71Irae62us/zG5uQCaAbTen FOPCqe8Fvii51GODJqr1RELA5oWVOlp8+VH1WpDDs+ne3f1WhSvteHpfmL9l3eYWE0Dv PeFZS8AytkXCRqjD45pOPmBkQvkx/VyredjspNbzdbLKh3Sg2X10uWrZSQVYVE0tHcWB opdze4SUq1SIP2xhAF38gubO4D2LZVx0D76eOebVqHiKsf+4opZUNHP7xZkraxuWtbuc JmpM2A/NFbmoVUZLFJUZvCMR9j0NVqr5SKwl6KXJTcOFMKDa6T4zg8DKl7nhfDbCqWoy cTzw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i123si24358302pgc.275.2017.05.24.07.30.16; Wed, 24 May 2017 07:30:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761123AbdEXOaK (ORCPT + 6 others); Wed, 24 May 2017 10:30:10 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:51710 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764713AbdEXOaH (ORCPT ); Wed, 24 May 2017 10:30:07 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0MSFeJ-1dOuL11pqF-00TUeo; Wed, 24 May 2017 16:30:04 +0200 From: Arnd Bergmann To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH] [stable 3.18] fix __unflatten_device_tree warning Date: Wed, 24 May 2017 16:30:01 +0200 Message-Id: <20170524143001.1678102-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:359zOf4RU5A48GxKJLQL8S+EX2gdI66jSAU5thcqc4GVo82w3WK cj/TfrOAX/0arCtHYyKTniN+E2vtAeRjzWCoqRu3aIELd2dH+KYJ9Nh4qGL0GaebVz6+fza k5kkSl28oZ0zpOPw+AYyeo7Oaw2Gf6jzRo26umNr5Fzl6VV1K7Re4q/uSImELKnZJ7YA3uq W/BUpv5PRglKBxOxCKL+w== X-UI-Out-Filterresults: notjunk:1; V01:K0:X4vlTa4RwMQ=:+gRRjH8kN8afGDfWxnCLrM 22KjmPxpRh5BJxPJRACV3dGlZTQqiC9Y7/EiKojtKvaHtI+8QrgCFSBsMAvHCtv/+/fIGdOBI +chTL8sJDfayr03sKBztu4FoKvFmnXyHbmM9UmOoLWP+d4KUUCs340cRrVi+QmBFfw8coDsCK y93So8k0b4M9BmdZcMwYuP5a+oHfd6bZBBWEnDIwhHUjqrQEq/iweI7fCp3Kfc/zE3PmKl2RL dEXwuHAG3jp5HbZy2zQqEChMZELErCKm+E6LgWI16uYzT21nfGEqRT+wyKLSG7oiupo5jZnF6 0WeXCWbiN2TGjMN82yKpa4DwDnZqxiXm8xAJoIChZ9oEnnL90vtSxAaXhWP50hxXi62mI0nbz ZQqoPKGFdN/amC26h+7tN8PnVMKETupNlQF9kUuBsSZB4wxsgRiFwbPYoMS9uq1uP3Cd9kCOL gSHdwgbX8cOSOSCvQE4fAhoD2Pywl7exQRfCLN8Le8tZ6PWTQB8ulkPTosUU3uaSTP0FdB2FR PgwfmOJsEAm/QohDa6T2gIb4Jo2Ff68LUeYbNmxminqvzSNan5PuuAzoMLjTQzr//2IpfgJeW 4NqbvnIocoI9VTGEY1jKcCzfWwt8ltWExA4EYGTzLfZakF1K5PqceTLj+Ol0MUZS454P8fpUf Q7PUUOO1MQ1GE6GPZZObSjjec7yvef/CmomUp5l8oC1DqdBMbmPhfrCixZAerRr9Kbm8= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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(-) -- 2.9.0 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);