Skip to contentSkip to conversation

mtd_dataflash: unbreak erase support

PATCH New David Woodhouse 1 participant 1 message May 18, 2009 Memory technology devices (MTD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mtd_dataflash: unbreak erase support

From: Peter Korsgaard <[email protected]>

Commit 5b7f3a50 (fix dataflash 64-bit divisions) unfortunately introduced a typo. Erase addr and len were swapped in the pageaddr calculation, causing the wrong sectors to get erased.

---
Resend with Artem's acked-by
David, clear regression from 2.6.28, please send to Linus for 2.6.30 Please consider for 2.6.29-stable as well.

 drivers/mtd/devices/mtd_dataflash.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mtd/devices/mtd_dataflash.c +1 -1
index 62dee54..43976aa 100644
@@ -178,7 +178,7 @@ static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr)
 		/* Calculate flash page address; use block erase (for speed) if
 		 * we're at a block boundary and need to erase the whole block.
 		 */
-		pageaddr = div_u64(instr->len, priv->page_size);
+		pageaddr = div_u64(instr->addr, priv->page_size);
 		do_block = (pageaddr & 0x7) == 0 && instr->len >= blocksize;
 		pageaddr = pageaddr << priv->page_offset;
 
Signature · 5 lines
1.6.2

-- 
David Woodhouse                            Open Source Technology Centre
[email protected]                              Intel Corporation