aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.7/460-cfi_cmdset_0002_no_erase_suspend.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2012-11-18 18:52:38 +0000
committerImre Kaloz <kaloz@openwrt.org>2012-11-18 18:52:38 +0000
commit43d2eb64ccb3a223ba2244faee1280aaa6f68d11 (patch)
tree86525769ccc1e76c33de9d10b51d14bdc0e1c8f7 /target/linux/generic/patches-3.7/460-cfi_cmdset_0002_no_erase_suspend.patch
parent2b0cba675561342a1a538bad8a7df10cf855323e (diff)
downloadupstream-43d2eb64ccb3a223ba2244faee1280aaa6f68d11.tar.gz
upstream-43d2eb64ccb3a223ba2244faee1280aaa6f68d11.tar.bz2
upstream-43d2eb64ccb3a223ba2244faee1280aaa6f68d11.zip
[generic]: add 3.7-rc6 support (patch 820 still has to be fixed)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34247 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.7/460-cfi_cmdset_0002_no_erase_suspend.patch')
-rw-r--r--target/linux/generic/patches-3.7/460-cfi_cmdset_0002_no_erase_suspend.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.7/460-cfi_cmdset_0002_no_erase_suspend.patch b/target/linux/generic/patches-3.7/460-cfi_cmdset_0002_no_erase_suspend.patch
new file mode 100644
index 0000000000..d64f340d1d
--- /dev/null
+++ b/target/linux/generic/patches-3.7/460-cfi_cmdset_0002_no_erase_suspend.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -762,7 +762,7 @@ static int get_chip(struct map_info *map
+ return 0;
+
+ case FL_ERASING:
+- if (!cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
++ if (1 /* no suspend */ || !cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
+ !(mode == FL_READY || mode == FL_POINT ||
+ (mode == FL_WRITING && (cfip->EraseSuspend & 0x2))))
+ goto sleep;