[kernel] rename 014-samsung_flash -> 014-samsung_flash.patch

[openwrt.git] / target / linux / orion / patches / 050-wrt350nv2_cfi_workaround.patch

diff --git a/target/linux/orion/patches/050-wrt350nv2_cfi_workaround.patch b/target/linux/orion/patches/050-wrt350nv2_cfi_workaround.patch
index 270d3e5..f10f89e 100644 (file)
--- a/target/linux/orion/patches/050-wrt350nv2_cfi_workaround.patch
+++ b/target/linux/orion/patches/050-wrt350nv2_cfi_workaround.patch
@@ -1,13 +1,13 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c

-@@ -323,8 +323,9 @@
-                       return NULL;
-               }
+@@ -374,8 +374,9 @@ struct mtd_info *cfi_cmdset_0002(struct 

  
  

--              if (extp->MajorVersion != '1' ||
+               cfi_fixup_major_minor(cfi, extp);
+ 
+-              if (extp->MajorVersion < '0' || extp->MajorVersion > '3' ||

 -                  (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
 +              if ((extp->MajorVersion != '0' && extp->MinorVersion != '0') &&
 -                  (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
 +              if ((extp->MajorVersion != '0' && extp->MinorVersion != '0') &&

-+                  (extp->MajorVersion != '1' ||
++                  (extp->MajorVersion < '0' || extp->MajorVersion > '3' ||

 +                  (extp->MinorVersion < '0' || extp->MinorVersion > '4'))) {
                        if (cfi->mfr == MANUFACTURER_SAMSUNG &&
                            (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
 +                  (extp->MinorVersion < '0' || extp->MinorVersion > '4'))) {
                        if (cfi->mfr == MANUFACTURER_SAMSUNG &&
                            (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {