Skip to content

Commit

Permalink
mtd: nand: jz4780: Update ecc correction error codes
Browse files Browse the repository at this point in the history
Update jz4780_bch_ecc_correct's return codes with appropriate values,
as specified in /include/linux/mtd/nand.h.

Signed-off-by: Harvey Hunt <harvey.hunt@imgtec.com>
Cc: Alex Smith <alex@alex-smith.me.uk>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
  • Loading branch information
Harvey Hunt authored and Brian Norris committed Jan 8, 2016
1 parent c66b651 commit 6c1207b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/mtd/nand/jz4780_bch.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ EXPORT_SYMBOL(jz4780_bch_calculate);
* Given the raw data and the ECC read from the NAND device, detects and
* corrects errors in the data.
*
* Return: the number of bit errors corrected, or -1 if there are too many
* errors to correct or we timed out waiting for the controller.
* Return: the number of bit errors corrected, -EBADMSG if there are too many
* errors to correct or -ETIMEDOUT if we timed out waiting for the controller.
*/
int jz4780_bch_correct(struct jz4780_bch *bch, struct jz4780_bch_params *params,
u8 *buf, u8 *ecc_code)
Expand All @@ -227,13 +227,13 @@ int jz4780_bch_correct(struct jz4780_bch *bch, struct jz4780_bch_params *params,

if (!jz4780_bch_wait_complete(bch, BCH_BHINT_DECF, &reg)) {
dev_err(bch->dev, "timed out while correcting data\n");
ret = -1;
ret = -ETIMEDOUT;
goto out;
}

if (reg & BCH_BHINT_UNCOR) {
dev_warn(bch->dev, "uncorrectable ECC error\n");
ret = -1;
ret = -EBADMSG;
goto out;
}

Expand Down

0 comments on commit 6c1207b

Please sign in to comment.