Add Broadcom / Netgear changes from RAXE 1.0.0.48

[project/bcm63xx/u-boot.git] / drivers / mtd / nand / core.c

diff --git a/drivers/mtd/nand/core.c b/drivers/mtd/nand/core.c
index 0b793695ccd6475c2e6c30e746fa8fec3c65352b..e9ed095265530b959c5fcf24712e7e3bd1b1a400 100644 (file)
--- a/drivers/mtd/nand/core.c
+++ b/drivers/mtd/nand/core.c
@@ -161,7 +161,11 @@ int nanddev_mtd_erase(struct mtd_info *mtd, struct erase_info *einfo)
        nanddev_offs_to_pos(nand, einfo->addr, &pos);
        nanddev_offs_to_pos(nand, einfo->addr + einfo->len - 1, &last);
        while (nanddev_pos_cmp(&pos, &last) <= 0) {
-               ret = nanddev_erase(nand, &pos);
+               if (einfo->scrub)
+                       ret = nand->ops->erase(nand, &pos);
+               else
+                       ret = nanddev_erase(nand, &pos);
+
                if (ret) {
                        einfo->fail_addr = nanddev_pos_to_offs(nand, &pos);