diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-08-25 19:57:11 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-08-25 19:57:11 +0000 |
| commit | a80b9af0cdef8c74c5613ee4c51ec246b2b26ecc (patch) | |
| tree | 82f2c670c6d228f0edb85864bfcd18c2fccac20b /target/linux/ar71xx/patches-2.6.32/108-mtd_fix_cfi_cmdset_0002_status_check.patch | |
| parent | cfb88ec980634107c8d021544a242afc771fc360 (diff) | |
| download | master-31e0f0ae-a80b9af0cdef8c74c5613ee4c51ec246b2b26ecc.tar.gz master-31e0f0ae-a80b9af0cdef8c74c5613ee4c51ec246b2b26ecc.tar.bz2 master-31e0f0ae-a80b9af0cdef8c74c5613ee4c51ec246b2b26ecc.zip | |
ar71xx: refresh patches
SVN-Revision: 22803
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.32/108-mtd_fix_cfi_cmdset_0002_status_check.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-2.6.32/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.32/108-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-2.6.32/108-mtd_fix_cfi_cmdset_0002_status_check.patch index d4272ab1b3..d524297a45 100644 --- a/target/linux/ar71xx/patches-2.6.32/108-mtd_fix_cfi_cmdset_0002_status_check.patch +++ b/target/linux/ar71xx/patches-2.6.32/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 -@@ -1141,8 +1141,8 @@ static int __xipram do_write_oneword(str +@@ -1169,8 +1169,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); -@@ -1158,6 +1158,8 @@ static int __xipram do_write_oneword(str +@@ -1186,6 +1186,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; -@@ -1504,7 +1506,6 @@ static int cfi_amdstd_write_buffers(stru +@@ -1532,7 +1534,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. -@@ -1568,8 +1569,8 @@ static int __xipram do_erase_chip(struct +@@ -1596,8 +1597,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", -@@ -1589,6 +1590,7 @@ static int __xipram do_erase_chip(struct +@@ -1617,6 +1618,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); -@@ -1656,9 +1658,9 @@ static int __xipram do_erase_oneblock(st +@@ -1684,9 +1686,9 @@ static int __xipram do_erase_oneblock(st chip->erase_suspended = 0; } @@ -59,7 +59,7 @@ } if (time_after(jiffies, timeo)) { -@@ -1680,6 +1682,7 @@ static int __xipram do_erase_oneblock(st +@@ -1708,6 +1710,7 @@ static int __xipram do_erase_oneblock(st ret = -EIO; } |