diff options
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/nand/nand_base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 21fce2bce4b2..2b29b47e2af4 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c | |||
@@ -889,7 +889,7 @@ static int nand_verify_pages(struct mtd_info *mtd, struct nand_chip *chip, int p | |||
889 | uint8_t *oob_buf, struct nand_oobinfo *oobsel, int chipnr, int oobmode) | 889 | uint8_t *oob_buf, struct nand_oobinfo *oobsel, int chipnr, int oobmode) |
890 | { | 890 | { |
891 | int i, j, datidx = 0, oobofs = 0, res = -EIO; | 891 | int i, j, datidx = 0, oobofs = 0, res = -EIO; |
892 | int eccsteps = chip->eccsteps; | 892 | int eccsteps = chip->ecc.steps; |
893 | int hweccbytes; | 893 | int hweccbytes; |
894 | uint8_t oobdata[64]; | 894 | uint8_t oobdata[64]; |
895 | 895 | ||
@@ -962,7 +962,7 @@ static int nand_verify_pages(struct mtd_info *mtd, struct nand_chip *chip, int p | |||
962 | return 0; | 962 | return 0; |
963 | 963 | ||
964 | /* Check, if the chip supports auto page increment */ | 964 | /* Check, if the chip supports auto page increment */ |
965 | if (!NAND_CANAUTOINCR(this)) | 965 | if (!NAND_CANAUTOINCR(chip)) |
966 | chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page); | 966 | chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page); |
967 | } | 967 | } |
968 | /* | 968 | /* |
@@ -1635,7 +1635,7 @@ static int nand_write(struct mtd_info *mtd, loff_t to, size_t len, | |||
1635 | if (!(page & (ppblock - 1))) { | 1635 | if (!(page & (ppblock - 1))) { |
1636 | int ofs; | 1636 | int ofs; |
1637 | chip->data_poi = bufstart; | 1637 | chip->data_poi = bufstart; |
1638 | ret = nand_verify_pages(mtd, this, startpage, page - startpage, | 1638 | ret = nand_verify_pages(mtd, chip, startpage, page - startpage, |
1639 | oobbuf, oobsel, chipnr, (eccbuf != NULL)); | 1639 | oobbuf, oobsel, chipnr, (eccbuf != NULL)); |
1640 | if (ret) { | 1640 | if (ret) { |
1641 | DEBUG(MTD_DEBUG_LEVEL0, "nand_write: verify_pages failed %d\n", ret); | 1641 | DEBUG(MTD_DEBUG_LEVEL0, "nand_write: verify_pages failed %d\n", ret); |
@@ -1663,7 +1663,7 @@ static int nand_write(struct mtd_info *mtd, loff_t to, size_t len, | |||
1663 | /* Verify the remaining pages */ | 1663 | /* Verify the remaining pages */ |
1664 | cmp: | 1664 | cmp: |
1665 | chip->data_poi = bufstart; | 1665 | chip->data_poi = bufstart; |
1666 | ret = nand_verify_pages(mtd, this, startpage, totalpages, oobbuf, oobsel, chipnr, (eccbuf != NULL)); | 1666 | ret = nand_verify_pages(mtd, chip, startpage, totalpages, oobbuf, oobsel, chipnr, (eccbuf != NULL)); |
1667 | if (!ret) | 1667 | if (!ret) |
1668 | *retlen = written; | 1668 | *retlen = written; |
1669 | else | 1669 | else |