diff options
| author | Masahiro Yamada | 2014-12-16 15:36:33 +0900 |
|---|---|---|
| committer | Scott Wood | 2015-01-09 12:18:58 -0600 |
| commit | 756963d7da746abd6448cb1d7be0c70b1c80ca35 (patch) | |
| tree | 7a36df4f1d0347bc47de9a0825732264d1b6f0fc /drivers/mtd | |
| parent | b188067f39627d977bb1db67c8456e9aaab90743 (diff) | |
mtd: nand: revive "nand scrub" command
Since commit ff94bc40af34 (mtd, ubi, ubifs: resync with Linux-3.14),
the "nand scrub" command has not been working.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 70e780c3113..d04c7ea0ae7 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2905,7 +2905,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, WATCHDOG_RESET(); /* Check if we have a bad block, we do not erase bad blocks! */ - if (nand_block_checkbad(mtd, ((loff_t) page) << + if (!instr->scrub && nand_block_checkbad(mtd, ((loff_t) page) << chip->page_shift, 0, allowbbt)) { pr_warn("%s: attempt to erase a bad block at page 0x%08x\n", __func__, page); |