OpenWrt – Rev 1

Subversion Repositories:
Rev:
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1635,8 +1635,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);
@@ -1652,6 +1652,8 @@ static int __xipram do_write_oneword(str
 
                ret = -EIO;
        }
+
+ enable_xip:
        xip_enable(map, chip, adr);
  op_done:
        if (mode == FL_OTP_WRITE)
@@ -2230,7 +2232,6 @@ static int cfi_amdstd_panic_write(struct
        return 0;
 }
 
-
 /*
  * Handle devices with one erase region, that only implement
  * the chip erase command.
@@ -2298,7 +2299,7 @@ static int __xipram do_erase_chip(struct
                }
 
                if (chip_good(map, adr, map_word_ff(map)))
-                       break;
+                       goto op_done;
 
                if (time_after(jiffies, timeo)) {
                        printk(KERN_WARNING "MTD %s(): software timeout\n",
@@ -2322,6 +2323,7 @@ static int __xipram do_erase_chip(struct
                }
        }
 
+ op_done:
        chip->state = FL_READY;
        xip_enable(map, chip, adr);
        DISABLE_VPP(map);
@@ -2395,7 +2397,7 @@ static int __xipram do_erase_oneblock(st
 
                if (chip_good(map, adr, map_word_ff(map))) {
                        xip_enable(map, chip, adr);
-                       break;
+                       goto op_done;
                }
 
                if (time_after(jiffies, timeo)) {
@@ -2421,6 +2423,7 @@ static int __xipram do_erase_oneblock(st
                }
        }
 
+ op_done:
        chip->state = FL_READY;
        DISABLE_VPP(map);
        put_chip(map, chip, adr);