1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 4c5e8a74e1b2..17bbd5062027 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -765,7 +765,7 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip)
  * Not for syndrome calculating ecc controllers, which use a special oob layout
  */
 static int nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
-                              uint8_t *buf)
+                              uint8_t *buf, int page)
 {
         chip->read_buf(mtd, buf, mtd->writesize);
         chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
@@ -781,7 +781,7 @@ static int nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
  * We need a special oob layout and handling even when OOB isn't used.
  */
 static int nand_read_page_raw_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
-                              uint8_t *buf)
+                              uint8_t *buf, int page)
 {
         int eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
@@ -820,7 +820,7 @@ static int nand_read_page_raw_syndrome(struct mtd_info *mtd, struct nand_chip *c
  * @buf:        buffer to store read data
  */
 static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
-                                uint8_t *buf)
+                                uint8_t *buf, int page)
 {
         int i, eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
@@ -830,7 +830,7 @@ static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
         uint8_t *ecc_code = chip->buffers->ecccode;
         uint32_t *eccpos = chip->ecc.layout->eccpos;
 
-        chip->ecc.read_page_raw(mtd, chip, buf);
+        chip->ecc.read_page_raw(mtd, chip, buf, page);
 
         for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize)
                 chip->ecc.calculate(mtd, p, &ecc_calc[i]);
@@ -943,7 +943,7 @@ static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, uint3
  * Not for syndrome calculating ecc controllers which need a special oob layout
  */
 static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
-                                uint8_t *buf)
+                                uint8_t *buf, int page)
 {
         int i, eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
@@ -988,7 +988,7 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
  * we need a special oob layout and handling.
  */
 static int nand_read_page_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
-                                   uint8_t *buf)
+                                   uint8_t *buf, int page)
 {
         int i, eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
@@ -1130,11 +1130,13 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
 
                         /* Now read the page into the buffer */
                         if (unlikely(ops->mode == MTD_OOB_RAW))
-                                ret = chip->ecc.read_page_raw(mtd, chip, bufpoi);
+                                ret = chip->ecc.read_page_raw(mtd, chip,
+                                                              bufpoi, page);
                         else if (!aligned && NAND_SUBPAGE_READ(chip) && !oob)
                                 ret = chip->ecc.read_subpage(mtd, chip, col, bytes, bufpoi);
                         else
-                                ret = chip->ecc.read_page(mtd, chip, bufpoi);
+                                ret = chip->ecc.read_page(mtd, chip, bufpoi,
+                                                          page);
                         if (ret < 0)
                                 break;