From patchwork Thu Jan 19 17:05:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 717252 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v49Wx6HHwz9sxN for ; Fri, 20 Jan 2017 04:17:49 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3v49Wx5XsNzDqnV for ; Fri, 20 Jan 2017 04:17:49 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mout.web.de (mout.web.de [212.227.17.12]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3v49Gn29VLzDqRV for ; Fri, 20 Jan 2017 04:06:24 +1100 (AEDT) Received: from [192.168.1.2] ([77.181.224.32]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MZDKy-1cp6Pa3nyO-00KxSQ; Thu, 19 Jan 2017 18:05:03 +0100 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> 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> 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:rgv6aC/Cxlc=:HMcFkFRZ41aesEZCyUFvAG 2txC979f9DBaOi5o/lI1WcqVBziQZ6/l/ZxCMSIwjdVkDcCKTbYmQEz2+viALkMSwRU2LMQ4M Df+kygrYjrjSXmUkqLwh33yOFsfIRNZHEedyMCKCph/e5QCKWbEotReJkMSWgd0C4JN3RrU2g wabgTZlqfbJgeSTYb/3tr8kKF9XnWBcBOjpYl1sAZBgjh4zDXk87In4coPmsFpvwIVdhOBu5C xR4GJ/hKlPiEhpL/42MhnvgilWkpv2z3bQRV6yknDIWVrderq9IY351Un1eSWBvNpWRBoUdwe 3iU1NbvnYG0Zz9HwM8e0Lg2YELobAvnQghEUqvrz8Bv2c/YFp1zArKE0Iy7NNs15DhAhbse+t TElWCy4Bhl8YGnExKfqcRxn2itYHMmnVzOZgSTbasRorZMND/jWZBr2YS2f4jy508z+/uewfV JkXk9z+99I3HDdoPrhySACXm7YsQUhZmr7Q5xf8lj/LMDAXo19PFAKapyfCrsTcIZe8vCNISo YXXDp7Mqc6+c0oah/F2fJWlbtk8MGUV/QN5tzvtClm7084BS02/xyYLjLWSBoBZN/5Zaj8wdo 5BJNHnwdw7mm9OK6gtdh1QPTbyRnJIkhJKJU2SnmeJqbCUVda2EVqIAb5ouivYMzkZbojgDCT kPs9IuwoqKNdlWOSxvzJAQd8sZctni8BN1R6pMARHTwUeShRi99+9z8ZFRZzs+VvlFi213lXx KC0RUOxkvQ+zjkJQ8/NNdpXsfRu+wZk9Mu1fn5FXZs6aM0ryqZb/dx+acOk1BHToZ2QwtttzU aQRIyKU X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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;