mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
[MTD] NAND: Missing fixups
The oob fixups broke a return value and missed one patch from the Mailing List. Signed-off-by: Savin Zlobec <savin@epico.si> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
22ae813b85
commit
0d420f9d61
1 changed files with 5 additions and 5 deletions
|
@ -1176,7 +1176,7 @@ static int nand_write_oob_std(struct mtd_info *mtd, struct nand_chip *chip,
|
|||
|
||||
status = chip->waitfunc(mtd, chip);
|
||||
|
||||
return status;
|
||||
return status & NAND_STATUS_FAIL ? -EIO : 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1271,10 +1271,6 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
|
|||
sndcmd = chip->ecc.read_oob(mtd, chip, page, sndcmd);
|
||||
buf = nand_transfer_oob(chip, buf, ops);
|
||||
|
||||
readlen -= ops->ooblen;
|
||||
if (!readlen)
|
||||
break;
|
||||
|
||||
if (!(chip->options & NAND_NO_READRDY)) {
|
||||
/*
|
||||
* Apply delay or wait for ready/busy pin. Do this
|
||||
|
@ -1288,6 +1284,10 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
|
|||
nand_wait_ready(mtd);
|
||||
}
|
||||
|
||||
readlen -= ops->ooblen;
|
||||
if (!readlen)
|
||||
break;
|
||||
|
||||
/* Increment page address */
|
||||
realpage++;
|
||||
|
||||
|
|
Loading…
Reference in a new issue