kernel: bump kernel 4.4 to version 4.4.140

[openwrt/staging/chunkeey.git] / target / linux / ar71xx / patches-4.4 / 403-mtd_fix_cfi_cmdset_0002_status_check.patch

diff --git a/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch
index 8f41d9432cb98eda80b5cce24c3b34123221b255..040d83d4cb70ce25b8bbb329e104613e9da298fd 100644 (file)
--- a/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch
+++ b/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch
@@ -20,50 +20,3 @@
        xip_enable(map, chip, adr);
   op_done:
        if (mode == FL_OTP_WRITE)
-@@ -2228,7 +2230,6 @@ static int cfi_amdstd_panic_write(struct
-       return 0;
- }
- 
--
- /*
-  * Handle devices with one erase region, that only implement
-  * the chip erase command.
-@@ -2293,8 +2294,8 @@ static int __xipram do_erase_chip(struct
-                       chip->erase_suspended = 0;
-               }
- 
--              if (chip_ready(map, adr))
--                      break;
-+              if (chip_good(map, adr, map_word_ff(map)))
-+                      goto op_done;
- 
-               if (time_after(jiffies, timeo)) {
-                       printk(KERN_WARNING "MTD %s(): software timeout\n",
-@@ -2314,6 +2315,7 @@ static int __xipram do_erase_chip(struct
-               ret = -EIO;
-       }
- 
-+ op_done:
-       chip->state = FL_READY;
-       xip_enable(map, chip, adr);
-       DISABLE_VPP(map);
-@@ -2383,9 +2385,9 @@ static int __xipram do_erase_oneblock(st
-                       chip->erase_suspended = 0;
-               }
- 
--              if (chip_ready(map, adr)) {
-+              if (chip_good(map, adr, map_word_ff(map))) {
-                       xip_enable(map, chip, adr);
--                      break;
-+                      goto op_done;
-               }
- 
-               if (time_after(jiffies, timeo)) {
-@@ -2407,6 +2409,7 @@ static int __xipram do_erase_oneblock(st
-               ret = -EIO;
-       }
- 
-+ op_done:
-       chip->state = FL_READY;
-       DISABLE_VPP(map);
-       put_chip(map, chip, adr);