mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 22:47:56 +00:00
30 lines
858 B
Diff
30 lines
858 B
Diff
|
From 8e72a3a1be8f6328bd7ef491332ba541547b6086 Mon Sep 17 00:00:00 2001
|
||
|
|
From: John Crispin <blogic@openwrt.org>
|
||
|
|
Date: Mon, 15 Jul 2013 00:38:51 +0200
|
||
|
|
Subject: [PATCH 36/53] mtd: fix cfi cmdset 0002 erase status check
|
||
|
|
|
||
|
|
---
|
||
|
|
drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||
|
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||
|
|
@@ -2291,7 +2291,7 @@ static int __xipram do_erase_chip(struct
|
||
|
|
chip->erase_suspended = 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (chip_ready(map, adr))
|
||
|
|
+ if (chip_good(map, adr, map_word_ff(map)))
|
||
|
|
break;
|
||
|
|
|
||
|
|
if (time_after(jiffies, timeo)) {
|
||
|
|
@@ -2380,7 +2380,7 @@ static int __xipram do_erase_oneblock(st
|
||
|
|
chip->erase_suspended = 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (chip_ready(map, adr)) {
|
||
|
|
+ if (chip_good(map, adr, map_word_ff(map))) {
|
||
|
|
xip_enable(map, chip, adr);
|
||
|
|
break;
|
||
|
|
}
|