From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754124AbdASRgS (ORCPT ); Thu, 19 Jan 2017 12:36:18 -0500 Received: from mout.web.de ([212.227.17.11]:57247 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753938AbdASRgG (ORCPT ); Thu, 19 Jan 2017 12:36:06 -0500 Subject: [PATCH 8/8] powerpc/nvram: Move an assignment for the variable "err" in nvram_scan_partitions() To: linuxppc-dev@lists.ozlabs.org, Benjamin Herrenschmidt , Daniel Axtens , Geliang Tang , Michael Ellerman , Nathan Fontenot , Pan Xinhui , Paul Gortmaker , Paul Mackerras References: <53545d97-6ed5-ff17-384f-82e72b3592f9@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: Date: Thu, 19 Jan 2017 18:05:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <53545d97-6ed5-ff17-384f-82e72b3592f9@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:P556HAgwO2egKFFo/xJGT8qbWpGgjHqfRQkjxw3GO6dmWGtI8sp fdoWQbd1r/rafIfJKI8LC+sXnS1QboTlMIfUHIg0jUprEOLNKrw10faLCnL9TNztjPy47JL nJ7C06SkUKUnAhKW8sF+DpBFeca/auZV5BCdmB6C/GkQX/Io0vuXQobBJfPwkTQmyD4SCOb NhpOCmqG0Ia/uKvDObjGw== X-UI-Out-Filterresults: notjunk:1;V01:K0:h/n0TDZDC5c=:g1TzLffTonsQNubIzw5s+q K+/WS2j1MDL8w5MUSa5RWzyWZMUykL2l8uKYbFyuFFozxoSj4ajue38UB6cmHO5HWQ7nlXtK2 JVX+tyR4zOxyYNP41fKLOJ0tutArFjy4aFLzJQTDmRMc0gW+A3qeb9hFzmkdQ/PYoTX1U4LSB iCYoLADwjLURduZ5q7J9uLBVmD3ePhiKgZYZb5vCdF0ZCSQn2MqB5DESN8E5jdpPfS37J6GnC JhnJjNkrDeqwzPD1HboptdyaLDCkjVY7B/HX/SLjkW81HIKUp178nALE/EujGqQmdnwnG67py nAB8Ebgu4bKpOQaryARHHRLINGWApsxBGUHC6mYgkbsG0IbMyHkz9r501Js+aIqtmGlRAxr91 LxkkHTN3bWHfmsLT9tVFpqoGHH5dt5fjohha+M4GacSbmPejn69Y3XiLxedoY8T/0x4JZvgZb zkcycf7H8c53/mQW373Is+skcMCRuQOAkqKh+JD4l/LLEJaxrojsUz53MNC7hS+sYlqWR9P7S BzPVWH64VnvuAczvGNYaP8CAeeeckfdECeOeGp5jBKiAzNulHBOzZEo1ZMdczbLq9n6SAPv5X xEDEFwzHsIOQh0RQ9W1Y5dENvsUMhvKc//nWdqQze+e+7yGVb1K+3CpZom49DqeG32qZE3Yqf m4KexLjjZhnnRLL212OKSXzGD/nJtXWC+i86a2u1XQ85aUi59nu2zkgTTsVtzzFgtTyFGPOw0 mZo1rqzrOQmX8+DgZ2O2A/fRgJ6ZvBe2d6JPfgXZKznRn7/+IAF6CHyKEK2qqh3BWKXt95SAg 8Mx1eJa Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 19 Jan 2017 17:27:37 +0100 A local variable was set to an error code before a concrete error situation was detected. Thus move the corresponding assignment into an if branch to indicate a software failure there. Signed-off-by: Markus Elfring --- arch/powerpc/kernel/nvram_64.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c index ed54147e3c60..5172115c4ef1 100644 --- a/arch/powerpc/kernel/nvram_64.c +++ b/arch/powerpc/kernel/nvram_64.c @@ -1173,9 +1173,10 @@ int __init nvram_scan_partitions(void) goto out; } tmp_part = kmalloc(sizeof(*tmp_part), GFP_KERNEL); - err = -ENOMEM; - if (!tmp_part) + if (!tmp_part) { + err = -ENOMEM; goto out; + } memcpy(&tmp_part->header, &phead, NVRAM_HEADER_LEN); tmp_part->index = cur_index; -- 2.11.0