From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751936AbbLaU0w (ORCPT ); Thu, 31 Dec 2015 15:26:52 -0500 Received: from mout.web.de ([212.227.15.3]:56791 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751033AbbLaU0r (ORCPT ); Thu, 31 Dec 2015 15:26:47 -0500 Subject: [PATCH 1/3] mtd-rfd_ftl: Replace a variable initialisation by assignments in move_block_contents() To: linux-mtd@lists.infradead.org, Brian Norris , David Woodhouse References: <566ABCD9.1060404@users.sourceforge.net> <56858E3A.7000706@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <56858F55.7040604@users.sourceforge.net> Date: Thu, 31 Dec 2015 21:25:57 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <56858E3A.7000706@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:fSkooRGiyAscXVRI3sYNKKtbXoY1B4bw+HrybTFGiXjXCFA9nej xZNEZRfHPij82JQAESfHMVtjebEiyNJuoHup20Fq7zvYm6SQ81WD4x9N4/cnfQ7diHxLp1+ GzLSFvnlsN0iM8McsJ8//Cwd1rkz/7fcgWgp5ZH0CRojNDwdgIC5vIOxxFrYyJw6Pv+J4K3 mwOnC38JzNFPGal9gTZ7g== X-UI-Out-Filterresults: notjunk:1;V01:K0:hEP7hNjqEso=:afURbB/TSd0+wpGkvsNKFC AB4dsjIeKP9ejwl2L9DdwsW+Ly9BipfK1EcAz246wTMPA0E7e693Jo6xrPWt+fOKKkAU8K8ud EDfKoYzqg8ePnbcPXYbzZjKUyi5U2hNdEYyFtVfMC9dzZZAKRZsLQ51kTLkPbPlI1ilplbRJ+ 9o0gXuLhDOtsRIqhgHWL98+pKWKkELRRVmr+DD1pgkNteVtlEsqMCxiCQywefw1HZr1zDSISl uSfirpUtfOJRd+rkNuSchP8s17nFuOmpmKixEGfhrlByX+n3DP44cm38oncQfPJEBVynAAjnn 1TREMuK/5+gQiCGBsdzJH1pBPsoNQ4xGxlsroGHpzfoBjXyJXKYvfhIMPoiV78HgaWGPpNsAf LEkrgT96PnlDCAiEXpxQxIogeXd6gx/tga+iPNtcPZdHXhPw4sprEAA1uCER/du4fActh9/2Y jgX5LKmtWmZLkB0rihh85stUhun/m4DWpK9Ynt6vNycbNr3DpCjws97GnJyDEzKsgd0LaD7bq BRa3MUm3nUFTryNM2WOD/x/232mwfY3/o2n5mCjRAR3VekETQ7aNtRSZUMcISwIb+iZBw3C9Z xaHGuYZjcT4hKJfA3UeEtI4b0w/Y5uWwEx0dKTQG5vLcAmvqyH0H1QHQwubE69r5AY7F5Saev U7FuG2qjqviNFBaDWzCZMdvCS0hW+w79/zJ6DM6HueB+Bi8VG9kjiEj1tvW0334SJZEqeZCiS yZLaKVmmFjqC908+ITt/w+SAFdzHMEd6wjfyx4CmthFd161uth4w66xnd3KnC6rUA0WeCNYvy Gm6Th6v Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 31 Dec 2015 20:34:51 +0100 Replace an explicit initialisation for the variable "rc" at the beginning by assignments that will only be performed if a memory allocation failed. Signed-off-by: Markus Elfring --- drivers/mtd/rfd_ftl.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c index d1cbf26..2927e1b 100644 --- a/drivers/mtd/rfd_ftl.c +++ b/drivers/mtd/rfd_ftl.c @@ -359,17 +359,21 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old void *sector_data; u16 *map; size_t retlen; - int i, rc = -ENOMEM; + int i, rc; part->is_reclaiming = 1; sector_data = kmalloc(SECTOR_SIZE, GFP_KERNEL); - if (!sector_data) + if (!sector_data) { + rc = -ENOMEM; goto err3; + } map = kmalloc(part->header_size, GFP_KERNEL); - if (!map) + if (!map) { + rc = -ENOMEM; goto err2; + } rc = mtd_read(part->mbd.mtd, part->blocks[block_no].offset, part->header_size, &retlen, (u_char *)map); -- 2.6.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Thu, 31 Dec 2015 20:25:57 +0000 Subject: [PATCH 1/3] mtd-rfd_ftl: Replace a variable initialisation by assignments in move_block_contents() Message-Id: <56858F55.7040604@users.sourceforge.net> List-Id: References: <566ABCD9.1060404@users.sourceforge.net> <56858E3A.7000706@users.sourceforge.net> In-Reply-To: <56858E3A.7000706@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-mtd@lists.infradead.org, Brian Norris , David Woodhouse Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: Markus Elfring Date: Thu, 31 Dec 2015 20:34:51 +0100 Replace an explicit initialisation for the variable "rc" at the beginning by assignments that will only be performed if a memory allocation failed. Signed-off-by: Markus Elfring --- drivers/mtd/rfd_ftl.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c index d1cbf26..2927e1b 100644 --- a/drivers/mtd/rfd_ftl.c +++ b/drivers/mtd/rfd_ftl.c @@ -359,17 +359,21 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old void *sector_data; u16 *map; size_t retlen; - int i, rc = -ENOMEM; + int i, rc; part->is_reclaiming = 1; sector_data = kmalloc(SECTOR_SIZE, GFP_KERNEL); - if (!sector_data) + if (!sector_data) { + rc = -ENOMEM; goto err3; + } map = kmalloc(part->header_size, GFP_KERNEL); - if (!map) + if (!map) { + rc = -ENOMEM; goto err2; + } rc = mtd_read(part->mbd.mtd, part->blocks[block_no].offset, part->header_size, &retlen, (u_char *)map); -- 2.6.3