1 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
2 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
3 @@ -1288,8 +1288,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 @@ -1305,6 +1305,8 @@ static int __xipram do_write_oneword(str
20 xip_enable(map, chip, adr);
22 chip->state = FL_READY;
23 @@ -1863,7 +1865,6 @@ static int cfi_amdstd_panic_write(struct
29 * Handle devices with one erase region, that only implement
30 * the chip erase command.
31 @@ -1927,8 +1928,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 @@ -1948,6 +1949,7 @@ static int __xipram do_erase_chip(struct
47 chip->state = FL_READY;
48 xip_enable(map, chip, adr);
50 @@ -2016,9 +2018,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 @@ -2040,6 +2042,7 @@ static int __xipram do_erase_oneblock(st
67 chip->state = FL_READY;
69 put_chip(map, chip, adr);