From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pb0-f44.google.com ([209.85.160.44]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WpZs1-0004U9-15 for linux-mtd@lists.infradead.org; Wed, 28 May 2014 09:10:03 +0000 Received: by mail-pb0-f44.google.com with SMTP id rq2so10870918pbb.3 for ; Wed, 28 May 2014 02:09:37 -0700 (PDT) Date: Wed, 28 May 2014 02:09:33 -0700 From: Brian Norris To: "ted.juan" Subject: Re: [PATCH] mtd: nand: omap: fix omap_calculate_ecc_bch() for-loop error Message-ID: <20140528090933.GD4285@norris-Latitude-E6410> References: <1400813650-7417-1-git-send-email-ted.juan@gmail.com> <1400815474-7871-1-git-send-email-ted.juan@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1400815474-7871-1-git-send-email-ted.juan@gmail.com> Cc: "ted.juan" , linux-mtd@lists.infradead.org, pekon@ti.com List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Hi Ted, Sorry, this patch does not apply to l2-mtd.git. I think it conflicts with some recent changes from Pekon. Please rebase and resend. On Fri, May 23, 2014 at 11:24:34AM +0800, ted.juan wrote: > From: "ted.juan" Can you format your name properly, without the dot, for proper authorship attribution? > > Fixes: 2c9f2365d1e1d0e318b068f683f18c99515b80f8 > mtd: nand: omap: ecc.calculate: merge omap3_calculate_ecc_bch4 in omap_calculate_ecc_bch > > Fixes: 7bcd1dca1d587ad29f9825ba4414620440e8c8da > mtd: nand: omap: ecc.calculate: merge omap3_calculate_ecc_bch8 in omap_calculate_ecc_bch > > CC: # 3.13.x+ > Signed-off-by: ted.juan Same here. > Acked-by: Pekon Gupta > --- > drivers/mtd/nand/omap2.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c > index 1ff49b8..e21145a 100644 > --- a/drivers/mtd/nand/omap2.c > +++ b/drivers/mtd/nand/omap2.c > @@ -1162,7 +1162,7 @@ static int __maybe_unused omap_calculate_ecc_bch(struct mtd_info *mtd, > struct gpmc_nand_regs *gpmc_regs = &info->reg; > u8 *ecc_code; > unsigned long nsectors, bch_val1, bch_val2, bch_val3, bch_val4; > - int i; > + int i, j; > > nsectors = ((readl(info->reg.gpmc_ecc_config) >> 4) & 0x7) + 1; > for (i = 0; i < nsectors; i++) { > @@ -1210,8 +1210,8 @@ static int __maybe_unused omap_calculate_ecc_bch(struct mtd_info *mtd, > case OMAP_ECC_BCH4_CODE_HW_DETECTION_SW: > /* Add constant polynomial to remainder, so that > * ECC of blank pages results in 0x0 on reading back */ > - for (i = 0; i < eccbytes; i++) > - ecc_calc[i] ^= bch4_polynomial[i]; > + for (j = 0; j < eccbytes; j++) > + ecc_calc[j] ^= bch4_polynomial[j]; > break; > case OMAP_ECC_BCH4_CODE_HW: > /* Set 8th ECC byte as 0x0 for ROM compatibility */ > @@ -1220,8 +1220,8 @@ static int __maybe_unused omap_calculate_ecc_bch(struct mtd_info *mtd, > case OMAP_ECC_BCH8_CODE_HW_DETECTION_SW: > /* Add constant polynomial to remainder, so that > * ECC of blank pages results in 0x0 on reading back */ > - for (i = 0; i < eccbytes; i++) > - ecc_calc[i] ^= bch8_polynomial[i]; > + for (j = 0; j < eccbytes; j++) > + ecc_calc[j] ^= bch8_polynomial[j]; > break; > case OMAP_ECC_BCH8_CODE_HW: > /* Set 14th ECC byte as 0x0 for ROM compatibility */ Thanks, Brian