summaryrefslogtreecommitdiff
path: root/drivers/mtd
diff options
context:
space:
mode:
authorAlex Dewar <alex.dewar90@gmail.com>2020-09-15 00:42:44 +0300
committerMiquel Raynal <miquel.raynal@bootlin.com>2020-09-30 17:44:17 +0300
commitd27c9859a0c2f270972c26df6b2d2cc69c6d30f4 (patch)
treec7aab97fffadaf471403fd535afc429f413a873a /drivers/mtd
parentf7721e4bfec16c9e95e26f4b66bc4574076822d9 (diff)
downloadlinux-d27c9859a0c2f270972c26df6b2d2cc69c6d30f4.tar.xz
mtd: rawnand: atmel: Check return values for nand_read_data_op
In atmel_nand_pmecc_read_pg(), nand_read_data_op() is called twice without the return values being checked for errors. Add these checks. Signed-off-by: Alex Dewar <alex.dewar90@gmail.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20200914214245.14626-1-alex.dewar90@gmail.com
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/raw/atmel/nand-controller.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c
index 309ce410d792..e6ceec8f50dc 100644
--- a/drivers/mtd/nand/raw/atmel/nand-controller.c
+++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
@@ -948,11 +948,17 @@ static int atmel_nand_pmecc_read_pg(struct nand_chip *chip, u8 *buf,
if (ret)
return ret;
- nand_read_data_op(chip, buf, mtd->writesize, false, false);
- nand_read_data_op(chip, chip->oob_poi, mtd->oobsize, false, false);
+ ret = nand_read_data_op(chip, buf, mtd->writesize, false, false);
+ if (ret)
+ goto out_disable;
+
+ ret = nand_read_data_op(chip, chip->oob_poi, mtd->oobsize, false, false);
+ if (ret)
+ goto out_disable;
ret = atmel_nand_pmecc_correct_data(chip, buf, raw);
+out_disable:
atmel_nand_pmecc_disable(chip, raw);
return ret;