diff options
author | Matteo Croce <rootkit85@yahoo.it> | 2010-02-28 16:33:15 +0000 |
---|---|---|
committer | Matteo Croce <rootkit85@yahoo.it> | 2010-02-28 16:33:15 +0000 |
commit | a15d58f605a776ee9a929fc46d52bfc7afc70de0 (patch) | |
tree | 9b12d235a2990389a0943f0bd707eed0d31a1e33 /target/linux/ar71xx/patches-2.6.33/108-mtd_fix_cfi_cmdset_0002_status_check.patch | |
parent | 2cb1d98fc227357486a22cfe9ce8fd9484ea2a1d (diff) | |
download | master-31e0f0ae-a15d58f605a776ee9a929fc46d52bfc7afc70de0.tar.gz master-31e0f0ae-a15d58f605a776ee9a929fc46d52bfc7afc70de0.tar.bz2 master-31e0f0ae-a15d58f605a776ee9a929fc46d52bfc7afc70de0.zip |
ar71xx: 2.6.33 patches
SVN-Revision: 19908
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.33/108-mtd_fix_cfi_cmdset_0002_status_check.patch')
-rw-r--r-- | target/linux/ar71xx/patches-2.6.33/108-mtd_fix_cfi_cmdset_0002_status_check.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-2.6.33/108-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-2.6.33/108-mtd_fix_cfi_cmdset_0002_status_check.patch new file mode 100644 index 0000000000..d4272ab1b3 --- /dev/null +++ b/target/linux/ar71xx/patches-2.6.33/108-mtd_fix_cfi_cmdset_0002_status_check.patch @@ -0,0 +1,69 @@ +--- 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 + 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); +@@ -1158,6 +1158,8 @@ static int __xipram do_write_oneword(str + + ret = -EIO; + } ++ ++ enable_xip: + xip_enable(map, chip, adr); + op_done: + chip->state = FL_READY; +@@ -1504,7 +1506,6 @@ static int cfi_amdstd_write_buffers(stru + return 0; + } + +- + /* + * Handle devices with one erase region, that only implement + * the chip erase command. +@@ -1568,8 +1569,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", +@@ -1589,6 +1590,7 @@ static int __xipram do_erase_chip(struct + ret = -EIO; + } + ++ op_done: + 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 + 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)) { +@@ -1680,6 +1682,7 @@ static int __xipram do_erase_oneblock(st + ret = -EIO; + } + ++ op_done: + chip->state = FL_READY; + put_chip(map, chip, adr); + spin_unlock(chip->mutex); |