diff options
author | Scott Wood <oss@buserror.net> | 2016-05-30 13:57:57 -0500 |
---|---|---|
committer | Scott Wood <oss@buserror.net> | 2016-06-03 20:27:48 -0500 |
commit | 81c772521ff26054a3fe75efa87d8daeae83e9b4 (patch) | |
tree | 8037d16f2aa0ba9a23625b16a412a2eca7df7a41 /drivers/mtd/nand/davinci_nand.c | |
parent | 17cb4b8f327eb983cef7c510fcf77f1635a00e48 (diff) | |
download | u-boot-imx-81c772521ff26054a3fe75efa87d8daeae83e9b4.zip u-boot-imx-81c772521ff26054a3fe75efa87d8daeae83e9b4.tar.gz u-boot-imx-81c772521ff26054a3fe75efa87d8daeae83e9b4.tar.bz2 |
mtd: nand: Add page argument to write_page() etc.
This change is part of the Linux 4.6 sync. It is being done before the
main sync patch in order to make it easier to address the issue across
all NAND drivers (many/most of which do not closely track their Linux
counterparts) separately from other merge issues.
Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'drivers/mtd/nand/davinci_nand.c')
-rw-r--r-- | drivers/mtd/nand/davinci_nand.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index 5e0c7bf..be9d666 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -380,10 +380,13 @@ static int nand_davinci_write_page(struct mtd_info *mtd, struct nand_chip *chip, chip->cmdfunc(mtd, NAND_CMD_SEQIN, 0x00, page); - if (unlikely(raw)) - status = chip->ecc.write_page_raw(mtd, chip, buf, oob_required); - else - status = chip->ecc.write_page(mtd, chip, buf, oob_required); + if (unlikely(raw)) { + status = chip->ecc.write_page_raw(mtd, chip, buf, + oob_required, page); + } else { + status = chip->ecc.write_page(mtd, chip, buf, + oob_required, page); + } if (status < 0) { ret = status; |