1 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
2 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
3 @@ -1632,8 +1632,8 @@ static int __xipram do_write_oneword(str
7 - if (chip_ready(map, adr))
9 + if (chip_good(map, adr, datum))
12 /* Latency issues. Drop the lock, wait a while and retry */
13 UDELAY(map, chip, adr, 1);
14 @@ -1649,6 +1649,8 @@ static int __xipram do_write_oneword(str
20 xip_enable(map, chip, adr);
22 if (mode == FL_OTP_WRITE)
23 @@ -2227,7 +2229,6 @@ static int cfi_amdstd_panic_write(struct
29 * Handle devices with one erase region, that only implement
30 * the chip erase command.
31 @@ -2291,8 +2292,8 @@ static int __xipram do_erase_chip(struct
32 chip->erase_suspended = 0;
35 - if (chip_ready(map, adr))
37 + if (chip_good(map, adr, map_word_ff(map)))
40 if (time_after(jiffies, timeo)) {
41 printk(KERN_WARNING "MTD %s(): software timeout\n",
42 @@ -2312,6 +2313,7 @@ static int __xipram do_erase_chip(struct
47 chip->state = FL_READY;
48 xip_enable(map, chip, adr);
50 @@ -2380,9 +2382,9 @@ static int __xipram do_erase_oneblock(st
51 chip->erase_suspended = 0;
54 - if (chip_ready(map, adr)) {
55 + if (chip_good(map, adr, map_word_ff(map))) {
56 xip_enable(map, chip, adr);
61 if (time_after(jiffies, timeo)) {
62 @@ -2404,6 +2406,7 @@ static int __xipram do_erase_oneblock(st
67 chip->state = FL_READY;
69 put_chip(map, chip, adr);