diff options
Diffstat (limited to 'drivers/mtd/onenand/onenand_base.c')
-rw-r--r-- | drivers/mtd/onenand/onenand_base.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index bdeac01e659f..75d757882697 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c | |||
@@ -719,13 +719,10 @@ out: | |||
719 | * onenand_verify_page - [GENERIC] verify the chip contents after a write | 719 | * onenand_verify_page - [GENERIC] verify the chip contents after a write |
720 | * @param mtd MTD device structure | 720 | * @param mtd MTD device structure |
721 | * @param buf the databuffer to verify | 721 | * @param buf the databuffer to verify |
722 | * @param block block address | ||
723 | * @param page page address | ||
724 | * | 722 | * |
725 | * Check DataRAM area directly | 723 | * Check DataRAM area directly |
726 | */ | 724 | */ |
727 | static int onenand_verify_page(struct mtd_info *mtd, u_char *buf, | 725 | static int onenand_verify_page(struct mtd_info *mtd, u_char *buf, loff_t addr) |
728 | loff_t addr, int block, int page) | ||
729 | { | 726 | { |
730 | struct onenand_chip *this = mtd->priv; | 727 | struct onenand_chip *this = mtd->priv; |
731 | void __iomem *dataram0, *dataram1; | 728 | void __iomem *dataram0, *dataram1; |
@@ -816,7 +813,7 @@ static int onenand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len, | |||
816 | written += thislen; | 813 | written += thislen; |
817 | 814 | ||
818 | /* Only check verify write turn on */ | 815 | /* Only check verify write turn on */ |
819 | ret = onenand_verify_page(mtd, (u_char *) buf, to, block, page); | 816 | ret = onenand_verify_page(mtd, (u_char *) buf, to); |
820 | if (ret) { | 817 | if (ret) { |
821 | DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: verify failed %d\n", ret); | 818 | DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: verify failed %d\n", ret); |
822 | goto out; | 819 | goto out; |
@@ -940,7 +937,7 @@ static int onenand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs, | |||
940 | u_char *eccbuf, struct nand_oobinfo *oobsel) | 937 | u_char *eccbuf, struct nand_oobinfo *oobsel) |
941 | { | 938 | { |
942 | struct onenand_chip *this = mtd->priv; | 939 | struct onenand_chip *this = mtd->priv; |
943 | unsigned char buffer[mtd->oobblock], *pbuf; | 940 | unsigned char buffer[MAX_ONENAND_PAGESIZE], *pbuf; |
944 | size_t total_len, len; | 941 | size_t total_len, len; |
945 | int i, written = 0; | 942 | int i, written = 0; |
946 | int ret = 0; | 943 | int ret = 0; |
@@ -1025,7 +1022,7 @@ static int onenand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs, | |||
1025 | 1022 | ||
1026 | 1023 | ||
1027 | /* Only check verify write turn on */ | 1024 | /* Only check verify write turn on */ |
1028 | ret = onenand_verify_page(mtd, (u_char *) pbuf, to, block, page); | 1025 | ret = onenand_verify_page(mtd, (u_char *) pbuf, to); |
1029 | if (ret) { | 1026 | if (ret) { |
1030 | DEBUG(MTD_DEBUG_LEVEL0, "onenand_writev_ecc: verify failed %d\n", ret); | 1027 | DEBUG(MTD_DEBUG_LEVEL0, "onenand_writev_ecc: verify failed %d\n", ret); |
1031 | goto out; | 1028 | goto out; |