mtd: nand: check the return code of 'read_oob/read_oob_raw'
Apparently, there is an implementor of 'read_oob' which may return an error inidication (e.g. docg4_read_oob may return -EIO). Test the return value of 'read_oob/read_oob_raw', and if negative, propagate the error, so it's returned by the '_read_oob' interface. Signed-off-by: Shmulik Ladkani <shmulik.ladkani@gmail.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
parent
5c2ffb11d4
commit
1951f2f710
|
@ -1791,6 +1791,7 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
|
|||
int readlen = ops->ooblen;
|
||||
int len;
|
||||
uint8_t *buf = ops->oobbuf;
|
||||
int ret = 0;
|
||||
|
||||
pr_debug("%s: from = 0x%08Lx, len = %i\n",
|
||||
__func__, (unsigned long long)from, readlen);
|
||||
|
@ -1826,9 +1827,12 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
|
|||
|
||||
while (1) {
|
||||
if (ops->mode == MTD_OPS_RAW)
|
||||
chip->ecc.read_oob_raw(mtd, chip, page);
|
||||
ret = chip->ecc.read_oob_raw(mtd, chip, page);
|
||||
else
|
||||
chip->ecc.read_oob(mtd, chip, page);
|
||||
ret = chip->ecc.read_oob(mtd, chip, page);
|
||||
|
||||
if (ret < 0)
|
||||
break;
|
||||
|
||||
len = min(len, readlen);
|
||||
buf = nand_transfer_oob(chip, buf, ops, len);
|
||||
|
@ -1857,7 +1861,10 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
|
|||
}
|
||||
}
|
||||
|
||||
ops->oobretlen = ops->ooblen;
|
||||
ops->oobretlen = ops->ooblen - readlen;
|
||||
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (mtd->ecc_stats.failed - stats.failed)
|
||||
return -EBADMSG;
|
||||
|
|
Loading…
Reference in a new issue