1 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
2 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
3 @@ -1700,7 +1700,7 @@ static int __xipram do_write_oneword_onc
6 if (chip_good(map, chip, adr, datum))
10 /* Latency issues. Drop the lock, wait a while and retry */
11 UDELAY(map, chip, adr, 1);
12 @@ -1782,6 +1782,8 @@ static int __xipram do_write_oneword_ret
18 xip_enable(map, chip, adr);
21 @@ -2401,7 +2403,6 @@ static int cfi_amdstd_panic_write(struct
27 * Handle devices with one erase region, that only implement
28 * the chip erase command.
29 @@ -2469,7 +2470,7 @@ static int __xipram do_erase_chip(struct
32 if (chip_good(map, chip, adr, map_word_ff(map)))
36 if (time_after(jiffies, timeo)) {
37 printk(KERN_WARNING "MTD %s(): software timeout\n",
38 @@ -2494,6 +2495,7 @@ static int __xipram do_erase_chip(struct
43 chip->state = FL_READY;
44 xip_enable(map, chip, adr);
46 @@ -2566,7 +2568,7 @@ static int __xipram do_erase_oneblock(st
49 if (chip_good(map, chip, adr, map_word_ff(map)))
53 if (time_after(jiffies, timeo)) {
54 printk(KERN_WARNING "MTD %s(): software timeout\n",
55 @@ -2591,6 +2593,7 @@ static int __xipram do_erase_oneblock(st
60 chip->state = FL_READY;
61 xip_enable(map, chip, adr);