Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74eb9ff5 authored by Boris Brezillon's avatar Boris Brezillon Committed by Brian Norris
Browse files

mtd: nand: sunxi: fix sunxi_nfc_hw_ecc_read/write_chunk() 



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.

Fixes: 913821bd ("mtd: nand: sunxi: introduce sunxi_nfc_hw_ecc_read/write_chunk()")
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent f3c63795

drivers/mtd/nand/sunxi_nand.c

+2 −2
Original line number Diff line number Diff line
@@ -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);