From: Mike Frysinger <vapier.adi@gmail.com>
Date: Wed, 30 Jul 2008 19:34:59 +0000 (-0700)
Subject: [MTD] [NAND] Blackfin NFC Driver: fix bug - do not clobber the status from the first... 
X-Git-Tag: v2.6.27-rc2~104^2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e274f025e2caaadc1a6dd41adc9c9a19be075110;p=linux-2.6-omap-h63xx.git

[MTD] [NAND] Blackfin NFC Driver: fix bug - do not clobber the status from the first 256 bytes if operating on 512 pages

Singed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index e87a5729732..3254348f858 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -273,7 +273,7 @@ static int bf5xx_nand_correct_data(struct mtd_info *mtd, u_char *dat,
 		dat += 256;
 		read_ecc += 8;
 		calc_ecc += 8;
-		ret = bf5xx_nand_correct_data_256(mtd, dat, read_ecc, calc_ecc);
+		ret |= bf5xx_nand_correct_data_256(mtd, dat, read_ecc, calc_ecc);
 	}
 
 	return ret;