mtd: rawnand: atmel: Check return values for nand_read_data_op
authorAlex Dewar <alex.dewar90@gmail.com>
Mon, 14 Sep 2020 21:42:44 +0000 (22:42 +0100)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Wed, 30 Sep 2020 14:44:17 +0000 (16:44 +0200)
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
drivers/mtd/nand/raw/atmel/nand-controller.c

index 309ce41..e6ceec8 100644 (file)
@@ -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;