[PATCH 07/39] mtd: nand: denali: transfer OOB only when oob_required is set

From: Masahiro Yamada
Date: Sat Nov 26 2016 - 13:11:48 EST


Currently, the denali_read_page_raw() always transfers the OOB and
copy the data to chip->oob_poi, ignoring the oob_required argument.
Respect the oob_required argument.

Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
---

drivers/mtd/nand/denali.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
index b2b050b..cbc7f75 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -1182,7 +1182,7 @@ static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
BUG();
}

- setup_ecc_for_xfer(denali, false, true);
+ setup_ecc_for_xfer(denali, false, oob_required ? true : false);
denali_enable_dma(denali, true);

dma_sync_single_for_device(denali->dev, addr, size, DMA_FROM_DEVICE);
@@ -1198,7 +1198,9 @@ static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
denali_enable_dma(denali, false);

memcpy(buf, denali->buf.buf, mtd->writesize);
- memcpy(chip->oob_poi, denali->buf.buf + mtd->writesize, mtd->oobsize);
+ if (oob_required)
+ memcpy(chip->oob_poi, denali->buf.buf + mtd->writesize,
+ mtd->oobsize);

return 0;
}
--
2.7.4