| Message ID | 1445372161-6529-1-git-send-email-boris.brezillon@free-electrons.com |
|---|---|
| State | Accepted |
| Commit | 74eb9ff54e21dbeefa04ff30e6aaf780b91dd261 |
| Headers | show |
On Tue, Oct 20, 2015 at 10:16:00PM +0200, Boris Brezillon wrote: > The sunxi_nfc_hw_ecc_read/write_chunk() functions try to avoid changing > the column address if unnecessary, but the logic to determine whether it's > necessary or not is currently wrong: it adds the ecc->bytes value to the > current offset where it should actually add ecc->size. > > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > Fixes 913821bdd211 "mtd: nand: sunxi: introduce sunxi_nfc_hw_ecc_read/write_chunk()" Pushed both to l2-mtd.git
diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c index ef46ac6..96f7370 100644 --- a/drivers/mtd/nand/sunxi_nand.c +++ b/drivers/mtd/nand/sunxi_nand.c @@ -588,7 +588,7 @@ static int sunxi_nfc_hw_ecc_read_chunk(struct mtd_info *mtd, sunxi_nfc_read_buf(mtd, data, ecc->size); - if (data_off + ecc->bytes != oob_off) + if (data_off + ecc->size != oob_off) nand->cmdfunc(mtd, NAND_CMD_RNDOUT, oob_off, -1); ret = sunxi_nfc_wait_cmd_fifo_empty(nfc); @@ -679,7 +679,7 @@ static int sunxi_nfc_hw_ecc_write_chunk(struct mtd_info *mtd, writel(sunxi_nfc_buf_to_user_data(oob), nfc->regs + NFC_REG_USER_DATA(0)); - if (data_off + ecc->bytes != oob_off) + if (data_off + ecc->size != oob_off) nand->cmdfunc(mtd, NAND_CMD_RNDIN, oob_off, -1); ret = sunxi_nfc_wait_cmd_fifo_empty(nfc);
The sunxi_nfc_hw_ecc_read/write_chunk() functions try to avoid changing the column address if unnecessary, but the logic to determine whether it's necessary or not is currently wrong: it adds the ecc->bytes value to the current offset where it should actually add ecc->size. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Fixes 913821bdd211 "mtd: nand: sunxi: introduce sunxi_nfc_hw_ecc_read/write_chunk()" --- drivers/mtd/nand/sunxi_nand.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)