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

Commit c4f3ef2c authored by Boris Brezillon's avatar Boris Brezillon
Browse files

mtd: nand: sunxi: make cur_off parameter optional in extra oob helpers 



Allow for NULL cur_offs values when the caller does not know where the
NAND page register pointer points to.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 828dec15

drivers/mtd/nand/sunxi_nand.c

+6 −4
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ static void sunxi_nfc_hw_ecc_read_extra_oob(struct mtd_info *mtd, 
	if (len <= 0)

		return;



	if (*cur_off != offset)

	if (!cur_off || *cur_off != offset)

		nand->cmdfunc(mtd, NAND_CMD_RNDOUT,

			      offset + mtd->writesize, -1);
@@ -966,6 +966,7 @@ static void sunxi_nfc_hw_ecc_read_extra_oob(struct mtd_info *mtd, 
		sunxi_nfc_randomizer_read_buf(mtd, oob + offset, len,

					      false, page);



	if (cur_off)

		*cur_off = mtd->oobsize + mtd->writesize;

}
@@ -1021,12 +1022,13 @@ static void sunxi_nfc_hw_ecc_write_extra_oob(struct mtd_info *mtd, 
	if (len <= 0)

		return;



	if (*cur_off != offset)

	if (!cur_off || *cur_off != offset)

		nand->cmdfunc(mtd, NAND_CMD_RNDIN,

			      offset + mtd->writesize, -1);



	sunxi_nfc_randomizer_write_buf(mtd, oob + offset, len, false, page);



	if (cur_off)

		*cur_off = mtd->oobsize + mtd->writesize;

}