diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-12-01 18:40:01 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-12-01 18:40:01 +0000 |
| commit | 79c24b2cb0ff8136c1bb0128c9ac5cde63c336b9 (patch) | |
| tree | 3758ae8e9bd0b82361b7db1bd7871dd44755f52e /target/linux/ar71xx/patches-2.6.37/108-mtd_fix_cfi_cmdset_0002_status_check.patch | |
| parent | 6d6bb8d6f3a81b9eeef0d3c81817e72d0f702eba (diff) | |
| download | upstream-79c24b2cb0ff8136c1bb0128c9ac5cde63c336b9.tar.gz upstream-79c24b2cb0ff8136c1bb0128c9ac5cde63c336b9.tar.bz2 upstream-79c24b2cb0ff8136c1bb0128c9ac5cde63c336b9.zip | |
ar71xx: refresh patches
SVN-Revision: 24210
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.37/108-mtd_fix_cfi_cmdset_0002_status_check.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-2.6.37/108-mtd_fix_cfi_cmdset_0002_status_check.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/ar71xx/patches-2.6.37/108-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-2.6.37/108-mtd_fix_cfi_cmdset_0002_status_check.patch index 54879baf1d..dc1bada6ba 100644 --- a/target/linux/ar71xx/patches-2.6.37/108-mtd_fix_cfi_cmdset_0002_status_check.patch +++ b/target/linux/ar71xx/patches-2.6.37/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 -@@ -1223,8 +1223,8 @@ static int __xipram do_write_oneword(str +@@ -1231,8 +1231,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); -@@ -1240,6 +1240,8 @@ static int __xipram do_write_oneword(str +@@ -1248,6 +1248,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; -@@ -1571,7 +1573,6 @@ static int cfi_amdstd_write_buffers(stru +@@ -1579,7 +1581,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. -@@ -1635,8 +1636,8 @@ static int __xipram do_erase_chip(struct +@@ -1643,8 +1644,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", -@@ -1656,6 +1657,7 @@ static int __xipram do_erase_chip(struct +@@ -1664,6 +1665,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); -@@ -1723,9 +1725,9 @@ static int __xipram do_erase_oneblock(st +@@ -1731,9 +1733,9 @@ static int __xipram do_erase_oneblock(st chip->erase_suspended = 0; } @@ -59,7 +59,7 @@ } if (time_after(jiffies, timeo)) { -@@ -1747,6 +1749,7 @@ static int __xipram do_erase_oneblock(st +@@ -1755,6 +1757,7 @@ static int __xipram do_erase_oneblock(st ret = -EIO; } |