From: David Brownell Fix a bug in the block-erase optimization for Dataflash; it was using block erase even for smaller segments that need page erase. That wouldn't matter for JFFS2, which never erases less than one block (sometimes several blocks), but for other callers it might. Signed-off-by: David Brownell Cc: David Woodhouse Cc: Thomas Gleixner Signed-off-by: Andrew Morton --- drivers/mtd/devices/mtd_dataflash.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/mtd/devices/mtd_dataflash.c~mtd_dataflash-fix-block-vs-page-erase drivers/mtd/devices/mtd_dataflash.c --- devel/drivers/mtd/devices/mtd_dataflash.c~mtd_dataflash-fix-block-vs-page-erase 2006-03-11 17:39:33.000000000 -0800 +++ devel-akpm/drivers/mtd/devices/mtd_dataflash.c 2006-03-11 17:39:33.000000000 -0800 @@ -178,7 +178,7 @@ static int dataflash_erase(struct mtd_in * we're at a block boundary and need to erase the whole block. */ pageaddr = instr->addr / priv->page_size; - do_block = (pageaddr & 0x7) == 0 && instr->len <= blocksize; + do_block = (pageaddr & 0x7) == 0 && instr->len >= blocksize; pageaddr = pageaddr << priv->page_offset; command[0] = do_block ? OP_ERASE_BLOCK : OP_ERASE_PAGE; _