ar71xx: refresh patches

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / patches-2.6.36 / 108-mtd_fix_cfi_cmdset_0002_status_check.patch

diff --git a/target/linux/ar71xx/patches-2.6.36/108-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-2.6.36/108-mtd_fix_cfi_cmdset_0002_status_check.patch
index ebb3b1ddf27a21b899eaeb8db52a7699817592d7..64e52b31c11389a503a4768ba7443a6c76c8f24a 100644 (file)
--- a/target/linux/ar71xx/patches-2.6.36/108-mtd_fix_cfi_cmdset_0002_status_check.patch
+++ b/target/linux/ar71xx/patches-2.6.36/108-mtd_fix_cfi_cmdset_0002_status_check.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1190,8 +1190,8 @@ static int __xipram do_write_oneword(str
+@@ -1218,8 +1218,8 @@ static int __xipram do_write_oneword(str
                        break;
                }
  
@@ -11,7 +11,7 @@
  
                /* Latency issues. Drop the lock, wait a while and retry */
                UDELAY(map, chip, adr, 1);
-@@ -1207,6 +1207,8 @@ static int __xipram do_write_oneword(str
+@@ -1235,6 +1235,8 @@ static int __xipram do_write_oneword(str
  
                ret = -EIO;
        }
@@ -20,7 +20,7 @@
        xip_enable(map, chip, adr);
   op_done:
        chip->state = FL_READY;
-@@ -1553,7 +1555,6 @@ static int cfi_amdstd_write_buffers(stru
+@@ -1581,7 +1583,6 @@ static int cfi_amdstd_write_buffers(stru
        return 0;
  }
  
@@ -28,7 +28,7 @@
  /*
   * Handle devices with one erase region, that only implement
   * the chip erase command.
-@@ -1617,8 +1618,8 @@ static int __xipram do_erase_chip(struct
+@@ -1645,8 +1646,8 @@ static int __xipram do_erase_chip(struct
                        chip->erase_suspended = 0;
                }
  
@@ -39,7 +39,7 @@
  
                if (time_after(jiffies, timeo)) {
                        printk(KERN_WARNING "MTD %s(): software timeout\n",
-@@ -1638,6 +1639,7 @@ static int __xipram do_erase_chip(struct
+@@ -1666,6 +1667,7 @@ static int __xipram do_erase_chip(struct
                ret = -EIO;
        }
  
@@ -47,7 +47,7 @@
        chip->state = FL_READY;
        xip_enable(map, chip, adr);
        put_chip(map, chip, adr);
-@@ -1705,9 +1707,9 @@ static int __xipram do_erase_oneblock(st
+@@ -1733,9 +1735,9 @@ static int __xipram do_erase_oneblock(st
                        chip->erase_suspended = 0;
                }
  
@@ -59,7 +59,7 @@
                }
  
                if (time_after(jiffies, timeo)) {
-@@ -1729,6 +1731,7 @@ static int __xipram do_erase_oneblock(st
+@@ -1757,6 +1759,7 @@ static int __xipram do_erase_oneblock(st
                ret = -EIO;
        }