1 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
2 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
3 @@ -1641,7 +1641,7 @@ static int __xipram do_write_oneword(str
6 if (chip_good(map, adr, datum))
10 /* Latency issues. Drop the lock, wait a while and retry */
11 UDELAY(map, chip, adr, 1);
12 @@ -1658,6 +1658,8 @@ static int __xipram do_write_oneword(str
18 xip_enable(map, chip, adr);
20 if (mode == FL_OTP_WRITE)
21 @@ -2240,7 +2242,6 @@ static int cfi_amdstd_panic_write(struct
27 * Handle devices with one erase region, that only implement
28 * the chip erase command.
29 @@ -2308,7 +2309,7 @@ static int __xipram do_erase_chip(struct
32 if (chip_good(map, adr, map_word_ff(map)))
36 if (time_after(jiffies, timeo)) {
37 printk(KERN_WARNING "MTD %s(): software timeout\n",
38 @@ -2332,6 +2333,7 @@ static int __xipram do_erase_chip(struct
43 chip->state = FL_READY;
44 xip_enable(map, chip, adr);
46 @@ -2405,7 +2407,7 @@ static int __xipram do_erase_oneblock(st
48 if (chip_good(map, adr, map_word_ff(map))) {
49 xip_enable(map, chip, adr);
54 if (time_after(jiffies, timeo)) {
55 @@ -2431,6 +2433,7 @@ static int __xipram do_erase_oneblock(st
60 chip->state = FL_READY;
62 put_chip(map, chip, adr);