diff options
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 e7dfcb156..6aac6a2bf 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); |