[kernel] generic-2.6/2.6.30: refresh patches

[openwrt.git] / target / linux / ifxmips / patches / 160-cfi-swap.patch

diff --git a/target/linux/ifxmips/patches/160-cfi-swap.patch b/target/linux/ifxmips/patches/160-cfi-swap.patch
index 116503f..5c98c35 100644 (file)
--- a/target/linux/ifxmips/patches/160-cfi-swap.patch
+++ b/target/linux/ifxmips/patches/160-cfi-swap.patch
@@ -1,15 +1,13 @@
-Index: linux-2.6.23/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;
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -1041,7 +1041,9 @@ static int __xipram do_write_oneword(str

        int retry_cnt = 0;
        int retry_cnt = 0;

+ 
+       adr += chip->start;

 -
 +#ifdef CONFIG_IFXMIPS
 +      adr ^= 2;
 +#endif
 -
 +#ifdef CONFIG_IFXMIPS
 +      adr ^= 2;
 +#endif

-       adr += chip->start;
- 

        spin_lock(chip->mutex);
        spin_lock(chip->mutex);

+       ret = get_chip(map, chip, adr, FL_WRITING);
+       if (ret) {