summaryrefslogtreecommitdiff
path: root/target/linux/ifxmips/patches/160-cfi-swap.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2008-05-08 07:18:51 +0000
committerJohn Crispin <john@openwrt.org>2008-05-08 07:18:51 +0000
commita78ea864ccaf4aa54d661269fe298f78e8dfca3e (patch)
treef11e5015941bff7570c139ca5c141f641a7148cd /target/linux/ifxmips/patches/160-cfi-swap.patch
parent0d253371299688eaa13cccb1d0b2b3a0fb0ee76b (diff)
downloadmtk-20170518-a78ea864ccaf4aa54d661269fe298f78e8dfca3e.zip
mtk-20170518-a78ea864ccaf4aa54d661269fe298f78e8dfca3e.tar.gz
mtk-20170518-a78ea864ccaf4aa54d661269fe298f78e8dfca3e.tar.bz2
bump ifxmips to 2.6.25.1
SVN-Revision: 11071
Diffstat (limited to 'target/linux/ifxmips/patches/160-cfi-swap.patch')
-rw-r--r--target/linux/ifxmips/patches/160-cfi-swap.patch17
1 files changed, 9 insertions, 8 deletions
diff --git a/target/linux/ifxmips/patches/160-cfi-swap.patch b/target/linux/ifxmips/patches/160-cfi-swap.patch
index 116503f..6ddfc7e 100644
--- a/target/linux/ifxmips/patches/160-cfi-swap.patch
+++ b/target/linux/ifxmips/patches/160-cfi-swap.patch
@@ -1,15 +1,16 @@
-Index: linux-2.6.23/drivers/mtd/chips/cfi_cmdset_0002.c
+Index: linux-2.6.25/drivers/mtd/chips/cfi_cmdset_0002.c
===================================================================
---- linux-2.6.23.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2007-11-02 23:02:29.000000000 +0100
-+++ linux-2.6.23/drivers/mtd/chips/cfi_cmdset_0002.c 2007-11-02 23:07:15.000000000 +0100
-@@ -1007,7 +1007,9 @@
- int ret = 0;
- map_word oldd;
+--- linux-2.6.25.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2008-05-07 18:58:41.000000000 +0100
++++ linux-2.6.25/drivers/mtd/chips/cfi_cmdset_0002.c 2008-05-07 18:58:42.000000000 +0100
+@@ -1015,7 +1015,9 @@
int retry_cnt = 0;
+
+ adr += chip->start;
-
+#ifdef CONFIG_IFXMIPS
+ adr ^= 2;
+#endif
- adr += chip->start;
-
spin_lock(chip->mutex);
+ ret = get_chip(map, chip, adr, FL_WRITING);
+ if (ret) {
+