diff options
author | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-04-10 11:15:13 -0400 |
---|---|---|
committer | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-04-22 13:59:29 -0400 |
commit | 23566c3798f315058862564ab3d01882316054eb (patch) | |
tree | c6c0bfec92a0e8d0f599320b5c015a87ef1ede85 /drivers | |
parent | 007b4e8b705a4eff184d567c5a8b496622f9e116 (diff) |
mtd: nand: Fix nanddev_mtd_erase()
Commit e7bfb3fdbde3 ("mtd: Stop updating erase_info->state and calling
mtd_erase_callback()") removed the einfo->state field and the
MTD_ERASE_XXX macros. At the same time, the generic NAND layer was added
and made sure to update the erase info state.
It did not result in a build failure after merging the nand/for-4.17
branch in mtd/next because the generic NAND layer is not selected yet.
Let's fix that before a config option starts selecting MTD_NAND_CORE.
Fixes: e7bfb3fdbde3 ("mtd: Stop updating erase_info->state and calling mtd_erase_callback()")
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mtd/nand/core.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mtd/nand/core.c b/drivers/mtd/nand/core.c index d0cd6f8635d7..9c9f8936b63b 100644 --- a/drivers/mtd/nand/core.c +++ b/drivers/mtd/nand/core.c | |||
@@ -162,7 +162,6 @@ int nanddev_mtd_erase(struct mtd_info *mtd, struct erase_info *einfo) | |||
162 | ret = nanddev_erase(nand, &pos); | 162 | ret = nanddev_erase(nand, &pos); |
163 | if (ret) { | 163 | if (ret) { |
164 | einfo->fail_addr = nanddev_pos_to_offs(nand, &pos); | 164 | einfo->fail_addr = nanddev_pos_to_offs(nand, &pos); |
165 | einfo->state = MTD_ERASE_FAILED; | ||
166 | 165 | ||
167 | return ret; | 166 | return ret; |
168 | } | 167 | } |
@@ -170,8 +169,6 @@ int nanddev_mtd_erase(struct mtd_info *mtd, struct erase_info *einfo) | |||
170 | nanddev_pos_next_eraseblock(nand, &pos); | 169 | nanddev_pos_next_eraseblock(nand, &pos); |
171 | } | 170 | } |
172 | 171 | ||
173 | einfo->state = MTD_ERASE_DONE; | ||
174 | |||
175 | return 0; | 172 | return 0; |
176 | } | 173 | } |
177 | EXPORT_SYMBOL_GPL(nanddev_mtd_erase); | 174 | EXPORT_SYMBOL_GPL(nanddev_mtd_erase); |