diff options
| author | Boris BREZILLON <boris.brezillon@free-electrons.com> | 2015-12-30 20:32:03 +0100 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2016-01-06 18:45:46 -0800 |
| commit | 6e9411923b8f4c0e568cbae0f35b7ee4eb989914 (patch) | |
| tree | ec7bf6355c95b14fd19794119d7fd5fbfb9e0186 /drivers/mtd/nand/mxc_nand.c | |
| parent | 6f357de854a6dfb9ce0d5d65f3971cf3d0a4af6f (diff) | |
| download | lwn-6e9411923b8f4c0e568cbae0f35b7ee4eb989914.tar.gz lwn-6e9411923b8f4c0e568cbae0f35b7ee4eb989914.zip | |
mtd: nand: return consistent error codes in ecc.correct() implementations
The error code returned by the ecc.correct() are not consistent over the
all implementations.
Document the expected behavior in include/linux/mtd/nand.h and fix
offending implementations.
[Brian: this looks like a bugfix for the ECC reporting in the bf5xx_nand
driver, but we haven't seen any testing results for it]
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Tested-by: Franklin S Cooper Jr. <fcooper@ti.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/nand/mxc_nand.c')
| -rw-r--r-- | drivers/mtd/nand/mxc_nand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index 95400992c3e9..66e56bb22c0f 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c @@ -674,7 +674,7 @@ static int mxc_nand_correct_data_v1(struct mtd_info *mtd, u_char *dat, if (((ecc_status & 0x3) == 2) || ((ecc_status >> 2) == 2)) { pr_debug("MXC_NAND: HWECC uncorrectable 2-bit ECC error\n"); - return -1; + return -EBADMSG; } return 0; @@ -701,7 +701,7 @@ static int mxc_nand_correct_data_v2_v3(struct mtd_info *mtd, u_char *dat, err = ecc_stat & ecc_bit_mask; if (err > err_limit) { printk(KERN_WARNING "UnCorrectable RS-ECC Error\n"); - return -1; + return -EBADMSG; } else { ret += err; } |