70 lines
1.6 KiB
Diff
70 lines
1.6 KiB
Diff
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
@@ -1306,8 +1306,8 @@ static int __xipram do_write_oneword(str
|
|
break;
|
|
}
|
|
|
|
- if (chip_ready(map, adr))
|
|
- break;
|
|
+ if (chip_good(map, adr, datum))
|
|
+ goto enable_xip;
|
|
|
|
/* Latency issues. Drop the lock, wait a while and retry */
|
|
UDELAY(map, chip, adr, 1);
|
|
@@ -1323,6 +1323,8 @@ static int __xipram do_write_oneword(str
|
|
|
|
ret = -EIO;
|
|
}
|
|
+
|
|
+ enable_xip:
|
|
xip_enable(map, chip, adr);
|
|
op_done:
|
|
chip->state = FL_READY;
|
|
@@ -1893,7 +1895,6 @@ static int cfi_amdstd_panic_write(struct
|
|
return 0;
|
|
}
|
|
|
|
-
|
|
/*
|
|
* Handle devices with one erase region, that only implement
|
|
* the chip erase command.
|
|
@@ -1957,8 +1958,8 @@ static int __xipram do_erase_chip(struct
|
|
chip->erase_suspended = 0;
|
|
}
|
|
|
|
- if (chip_ready(map, adr))
|
|
- break;
|
|
+ if (chip_good(map, adr, map_word_ff(map)))
|
|
+ goto op_done;
|
|
|
|
if (time_after(jiffies, timeo)) {
|
|
printk(KERN_WARNING "MTD %s(): software timeout\n",
|
|
@@ -1978,6 +1979,7 @@ static int __xipram do_erase_chip(struct
|
|
ret = -EIO;
|
|
}
|
|
|
|
+ op_done:
|
|
chip->state = FL_READY;
|
|
xip_enable(map, chip, adr);
|
|
DISABLE_VPP(map);
|
|
@@ -2046,9 +2048,9 @@ 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;
|
|
+ goto op_done;
|
|
}
|
|
|
|
if (time_after(jiffies, timeo)) {
|
|
@@ -2070,6 +2072,7 @@ static int __xipram do_erase_oneblock(st
|
|
ret = -EIO;
|
|
}
|
|
|
|
+ op_done:
|
|
chip->state = FL_READY;
|
|
DISABLE_VPP(map);
|
|
put_chip(map, chip, adr);
|