35 lines
1 KiB
Diff
35 lines
1 KiB
Diff
|
From 413b2ed67d8e4dc1242edb9286ea3f634d10a6ba Mon Sep 17 00:00:00 2001
|
||
|
|
From: John Crispin <blogic@openwrt.org>
|
||
|
|
Date: Mon, 15 Jul 2013 00:38:51 +0200
|
||
|
|
Subject: [PATCH 32/33] mtd: fix cfi cmdset 0002 erase status check
|
||
|
|
|
||
|
|
---
|
||
|
|
drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||
|
|
index fff665d..ab8eb03 100644
|
||
|
|
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||
|
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||
|
|
@@ -1956,7 +1956,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)
|
||
|
|
chip->erase_suspended = 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (chip_ready(map, adr))
|
||
|
|
+ if (chip_good(map, adr, map_word_ff(map)))
|
||
|
|
break;
|
||
|
|
|
||
|
|
if (time_after(jiffies, timeo)) {
|
||
|
|
@@ -2045,7 +2045,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
|
||
|
|
chip->erase_suspended = 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (chip_ready(map, adr)) {
|
||
|
|
+ if (chip_good(map, adr, map_word_ff(map))) {
|
||
|
|
xip_enable(map, chip, adr);
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.7.10.4
|
||
|
|
|