2015-12-10 19:06:32 +00:00
|
|
|
From 8e72a3a1be8f6328bd7ef491332ba541547b6086 Mon Sep 17 00:00:00 2001
|
2015-02-09 12:13:55 +00:00
|
|
|
From: John Crispin <blogic@openwrt.org>
|
|
|
|
|
Date: Mon, 15 Jul 2013 00:38:51 +0200
|
2015-12-10 19:06:32 +00:00
|
|
|
Subject: [PATCH 36/53] mtd: fix cfi cmdset 0002 erase status check
|
2015-02-09 12:13:55 +00:00
|
|
|
|
|
|
|
|
---
|
|
|
|
|
drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++--
|
|
|
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
2015-12-10 19:06:32 +00:00
|
|
|
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
|
|
|
index c3624eb..60d960a 100644
|
2015-02-09 12:13:55 +00:00
|
|
|
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
|
|
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
2015-12-10 19:06:32 +00:00
|
|
|
@@ -2290,7 +2290,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)
|
2015-02-09 12:13:55 +00:00
|
|
|
chip->erase_suspended = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- if (chip_ready(map, adr))
|
|
|
|
|
+ if (chip_good(map, adr, map_word_ff(map)))
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if (time_after(jiffies, timeo)) {
|
2015-12-10 19:06:32 +00:00
|
|
|
@@ -2379,7 +2379,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
|
2015-02-09 12:13:55 +00:00
|
|
|
chip->erase_suspended = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- if (chip_ready(map, adr)) {
|
|
|
|
|
+ if (chip_good(map, adr, map_word_ff(map))) {
|
|
|
|
|
xip_enable(map, chip, adr);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2015-12-10 19:06:32 +00:00
|
|
|
--
|
|
|
|
|
1.7.10.4
|
|
|
|
|
|
