linux/generic: fix a mistake in 2.6.37/089-mtd-samsung-flash.patch. (thank you maddes)
authorAlexandros C. Couloumbis <alex@ozo.com>
Thu, 11 Nov 2010 14:57:58 +0000 (14:57 +0000)
committerAlexandros C. Couloumbis <alex@ozo.com>
Thu, 11 Nov 2010 14:57:58 +0000 (14:57 +0000)
SVN-Revision: 23957

target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch

index 03d890e..9b38ee4 100644 (file)
@@ -1,28 +1,21 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -394,15 +394,31 @@ static void cfi_fixup_major_minor(struct
+@@ -394,9 +394,33 @@ static void cfi_fixup_major_minor(struct
  {
        // manufacturers defined in include/linux/mtd/cfi.h
  
 -      if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
 -          extp->MajorVersion == '0')
--              extp->MajorVersion = '1';
--      /*
--       * SST 38VF640x chips report major=0xFF / minor=0xFF.
--       */
--      if (cfi->mfr == CFI_MFR_SST && (cfi->id >> 4) == 0x0536) {
--              extp->MajorVersion = '1';
--              extp->MinorVersion = '0';
 +      if (cfi->mfr == CFI_MFR_SAMSUNG &&
 +              extp->MajorVersion == '0') {
 +                      printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
 +                              extp->MajorVersion, extp->MinorVersion);
 +
-+                      extp->MajorVersion = '1';
-+                      extp->MinorVersion = '0';
+               extp->MajorVersion = '1';
++              extp->MinorVersion = '0';
 +
-+                      printk(" to %c.%c.\n",
-+                              extp->MajorVersion, extp->MinorVersion);
++              printk(" to %c.%c.\n",
++                      extp->MajorVersion, extp->MinorVersion);
 +      }
 +
 +      if (cfi->mfr == CFI_MFR_SAMSUNG &&
 +                      printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
 +                              extp->MajorVersion, extp->MinorVersion);
 +
-+                      extp->MajorVersion = '1';       // set to 1.3 (last defined version)
++                      extp->MajorVersion = '1';       // set to 1.3 (last defined version)
 +                      extp->MinorVersion = '3';
 +
 +                      printk(" to %c.%c.\n",
 +                              extp->MajorVersion, extp->MinorVersion);
-       }
- }
++      }
++
+       /*
+        * SST 38VF640x chips report major=0xFF / minor=0xFF.
+        */