aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/460-cfi_cmdset_0002_no_erase_suspend.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-05-19 18:36:15 +0000
committerJonas Gorski <jogo@openwrt.org>2013-05-19 18:36:15 +0000
commit3c5635a3aa3dd00eb47cf0191588ed64f6d10f29 (patch)
tree6b6bd393ef7dac1fdb3f9503f6bfc07e09b2ad25 /target/linux/generic/patches-3.10/460-cfi_cmdset_0002_no_erase_suspend.patch
parent8ef2514fb69dce5191f3e967a68663d9baa5f6d0 (diff)
downloadmaster-187ad058-3c5635a3aa3dd00eb47cf0191588ed64f6d10f29.tar.gz
master-187ad058-3c5635a3aa3dd00eb47cf0191588ed64f6d10f29.tar.bz2
master-187ad058-3c5635a3aa3dd00eb47cf0191588ed64f6d10f29.zip
kernel: generic: add 3.10-rc1 support
Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36663 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/460-cfi_cmdset_0002_no_erase_suspend.patch')
-rw-r--r--target/linux/generic/patches-3.10/460-cfi_cmdset_0002_no_erase_suspend.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.10/460-cfi_cmdset_0002_no_erase_suspend.patch b/target/linux/generic/patches-3.10/460-cfi_cmdset_0002_no_erase_suspend.patch
new file mode 100644
index 0000000000..0854a564c6
--- /dev/null
+++ b/target/linux/generic/patches-3.10/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
+@@ -780,7 +780,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;