diff options
author | Felix Fietkau <nbd@openwrt.org> | 2006-11-24 00:56:51 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2006-11-24 00:56:51 +0000 |
commit | 3b9654520c414ee0064ded6bc5b127280f136b28 (patch) | |
tree | 9cd8f70d8f031f448f96ffbf04046eb2a869cb41 /target/linux/generic-2.4/patches/115-amd_flash_timeout.patch | |
parent | cf921b2f2874acc2f5427ecff6775a1e13d760cd (diff) | |
download | upstream-3b9654520c414ee0064ded6bc5b127280f136b28.tar.gz upstream-3b9654520c414ee0064ded6bc5b127280f136b28.tar.bz2 upstream-3b9654520c414ee0064ded6bc5b127280f136b28.zip |
upgrade to linux 2.4.33.4
SVN-Revision: 5634
Diffstat (limited to 'target/linux/generic-2.4/patches/115-amd_flash_timeout.patch')
-rw-r--r-- | target/linux/generic-2.4/patches/115-amd_flash_timeout.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/target/linux/generic-2.4/patches/115-amd_flash_timeout.patch b/target/linux/generic-2.4/patches/115-amd_flash_timeout.patch deleted file mode 100644 index 188aa1c88a..0000000000 --- a/target/linux/generic-2.4/patches/115-amd_flash_timeout.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -u linux-2.4.30/drivers/mtd/chips/cfi_cmdset_0002.c.orig linux-2.4.30/drivers/mtd/chips/cfi_cmdset_0002.c ---- linux-2.4.30/drivers/mtd/chips/cfi_cmdset_0002.c.orig 2004-11-17 12:54:21.000000000 +0100 -+++ linux-2.4.30/drivers/mtd/chips/cfi_cmdset_0002.c 2006-10-21 17:55:25.000000000 +0200 -@@ -510,7 +510,7 @@ - or tells us why it failed. */ - dq6 = CMD(1<<6); - dq5 = CMD(1<<5); -- timeo = jiffies + (HZ/1000); /* setting timeout to 1ms for now */ -+ timeo = jiffies + (HZ/1000) + 1; /* setting timeout to 1ms for now */ - - oldstatus = cfi_read(map, adr); - status = cfi_read(map, adr); -@@ -547,7 +547,7 @@ - printk(KERN_WARNING "Internal flash device timeout occurred or write operation was performed while flash was programming.\n" ); - } - } else { -- printk(KERN_WARNING "Waiting for write to complete timed out in do_write_oneword."); -+ printk(KERN_WARNING "Waiting for write to complete timed out in do_write_oneword.\n"); - - chip->state = FL_READY; - wake_up(&chip->wq); -@@ -825,7 +825,7 @@ - chip->state = FL_READY; - wake_up(&chip->wq); - cfi_spin_unlock(chip->mutex); -- printk("waiting for erase to complete timed out."); -+ printk("waiting for erase to complete timed out.\n"); - DISABLE_VPP(map); - return -EIO; - } -@@ -963,7 +963,7 @@ - } - else - { -- printk( "Waiting for erase to complete timed out in do_erase_oneblock."); -+ printk( "Waiting for erase to complete timed out in do_erase_oneblock.\n"); - - chip->state = FL_READY; - wake_up(&chip->wq); |