diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2011-09-12 06:04:06 +0200 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2011-10-03 18:35:12 -0500 |
| commit | 6d41419f0b010db03c01dec59875144457aa11d2 (patch) | |
| tree | d77ba5724d272ccffa14e6cc7ae601beedd5be16 /drivers/mtd/nand/nand_base.c | |
| parent | dc7cd8e59ba077f3b4c1a4557c9cd86a31b9ab1f (diff) | |
| download | u-boot-imx-6d41419f0b010db03c01dec59875144457aa11d2.zip u-boot-imx-6d41419f0b010db03c01dec59875144457aa11d2.tar.gz u-boot-imx-6d41419f0b010db03c01dec59875144457aa11d2.tar.bz2 | |
NAND: Really ignore bad blocks when scrubbing
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
[scottwood@freescale.com: use chip instead of redundant priv_nand]
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'drivers/mtd/nand/nand_base.c')
| -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 e7dfcb1..6aac6a2 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2224,7 +2224,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, /* * heck 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)) { printk(KERN_WARNING "nand_erase: attempt to erase a " "bad block at page 0x%08x\n", page); |