Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23566c37 authored by Boris Brezillon's avatar Boris Brezillon
Browse files

mtd: nand: Fix nanddev_mtd_erase() 



Commit e7bfb3fd ("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: e7bfb3fd ("mtd: Stop updating erase_info->state and calling mtd_erase_callback()")
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent 007b4e8b

drivers/mtd/nand/core.c

+0 −3
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ int nanddev_mtd_erase(struct mtd_info *mtd, struct erase_info *einfo) 
		ret = nanddev_erase(nand, &pos);

		if (ret) {

			einfo->fail_addr = nanddev_pos_to_offs(nand, &pos);

			einfo->state = MTD_ERASE_FAILED;



			return ret;

		}
@@ -170,8 +169,6 @@ int nanddev_mtd_erase(struct mtd_info *mtd, struct erase_info *einfo) 
		nanddev_pos_next_eraseblock(nand, &pos);

	}



	einfo->state = MTD_ERASE_DONE;



	return 0;

}

EXPORT_SYMBOL_GPL(nanddev_mtd_erase);