[MTD] [NAND] Blackfin NFC Driver: fix bug - do not clobber the status from the first...

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 e87a57297328c4a72cde3d01c605e94d0299eee3..3254348f85813d551d88a8c9fb859fd469e0bf7f 100644 (file)
--- 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;