Commit 3cb4f09f authored Mar 13, 2006 by David Brownell Committed by Linus Torvalds Mar 14, 2006

[PATCH] mtd_dataflash, fix block vs page erase



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 <dbrownell@users.sourceforge.net>
Acked-by: David Woodhouse <dwmw2@infradead.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 3759fa9c

drivers/mtd/devices/mtd_dataflash.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -178,7 +178,7 @@ static int dataflash_erase(struct mtd_info mtd, struct erase_info instr)
		* 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;