summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2014-12-12 11:23:27 +0100
committerStefan Agner <stefan.agner@toradex.com>2014-12-12 11:23:27 +0100
commite6deb22289cb6b45405e1d8fad0fa040839fe825 (patch)
tree8baa87ebcb8fb0e296bb6864c71af58a49976c6c
parenteca9562214688bc2cf9dbb10b51febcb3ab6209a (diff)
parent21b75d1cacf9efa8dc5e9da5940b35b4cce9f9cf (diff)
Merge branch 'vf610-nfc-3.18' into toradex_vf_3.18-next
-rw-r--r--drivers/mtd/nand/fsl_nfc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/fsl_nfc.c b/drivers/mtd/nand/fsl_nfc.c
index 1db445b3a318..bfc7b7b7190a 100644
--- a/drivers/mtd/nand/fsl_nfc.c
+++ b/drivers/mtd/nand/fsl_nfc.c
@@ -524,7 +524,7 @@ static int nfc_correct_data(struct mtd_info *mtd, u_char *dat,
flip = count_written_bits(dat, nfc->chip.ecc.size, ecc_count);
/* ECC failed. */
- if (flip > ecc_count)
+ if (flip > ecc_count && flip > (nfc->chip.ecc.strength / 2))
return -1;
/* Erased page. */