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: fix error handling in nand_prog_page_op() #2
On success nand_exec_prog_page_op() returns the NAND status byte, but on failure it returns a negative error code. nand_prog_page_op() interprets the return value as NAND status byte without error checking. This means a failure in nand_exec_prog_page_op() can go through unnoticed. The straight forward fix would be to add the missing error checking. To clean the code a bit we can move the nand status check to nand_prog_page_op(). This way we can get rid of the overloaded return value from nand_exec_prog_page_op() and return a plain error code which is less error prone. nand_exec_prog_page_op() is only called from one other place and in this call the 'prog' parameter is false in which case the nand status check is skipped, so it's correct to not add the NAND status check there. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20210205142725.13225-2-s.hauer@pengutronix.de
This commit is contained in:
parent
ec9e0203a3
commit
8ffbec7df4
1 changed files with 15 additions and 16 deletions
|
@ -1294,8 +1294,6 @@ static int nand_exec_prog_page_op(struct nand_chip *chip, unsigned int page,
|
|||
};
|
||||
struct nand_operation op = NAND_OPERATION(chip->cur_cs, instrs);
|
||||
int naddrs = nand_fill_column_cycles(chip, addrs, offset_in_page);
|
||||
int ret;
|
||||
u8 status;
|
||||
|
||||
if (naddrs < 0)
|
||||
return naddrs;
|
||||
|
@ -1335,15 +1333,7 @@ static int nand_exec_prog_page_op(struct nand_chip *chip, unsigned int page,
|
|||
op.ninstrs--;
|
||||
}
|
||||
|
||||
ret = nand_exec_op(chip, &op);
|
||||
if (!prog || ret)
|
||||
return ret;
|
||||
|
||||
ret = nand_status_op(chip, &status);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return status;
|
||||
return nand_exec_op(chip, &op);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1449,7 +1439,8 @@ int nand_prog_page_op(struct nand_chip *chip, unsigned int page,
|
|||
unsigned int len)
|
||||
{
|
||||
struct mtd_info *mtd = nand_to_mtd(chip);
|
||||
int status;
|
||||
u8 status;
|
||||
int ret;
|
||||
|
||||
if (!len || !buf)
|
||||
return -EINVAL;
|
||||
|
@ -1458,16 +1449,24 @@ int nand_prog_page_op(struct nand_chip *chip, unsigned int page,
|
|||
return -EINVAL;
|
||||
|
||||
if (nand_has_exec_op(chip)) {
|
||||
status = nand_exec_prog_page_op(chip, page, offset_in_page, buf,
|
||||
ret = nand_exec_prog_page_op(chip, page, offset_in_page, buf,
|
||||
len, true);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = nand_status_op(chip, &status);
|
||||
if (ret)
|
||||
return ret;
|
||||
} else {
|
||||
chip->legacy.cmdfunc(chip, NAND_CMD_SEQIN, offset_in_page,
|
||||
page);
|
||||
chip->legacy.write_buf(chip, buf, len);
|
||||
chip->legacy.cmdfunc(chip, NAND_CMD_PAGEPROG, -1, -1);
|
||||
status = chip->legacy.waitfunc(chip);
|
||||
if (status < 0)
|
||||
return status;
|
||||
ret = chip->legacy.waitfunc(chip);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
status = ret;
|
||||
}
|
||||
|
||||
if (status & NAND_STATUS_FAIL)
|
||||
|
|
Loading…
Reference in a new issue