X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpatches-2.6.36%2F089-mtd-samsung-flash.patch;h=bdbb325b86b9f387aee94d9a6fb42c634e97219e;hb=ce0984ec5db9152548582ca9b6b440c0b7cc0153;hp=1d13d4ed5b5478ffc13a7c8258c63d7d8dfadc64;hpb=911c2540b012a488824dcfeffdcbedc75439cbc1;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch b/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch
index 1d13d4ed5b..bdbb325b86 100644
--- a/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch
+++ b/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch
@@ -1,36 +1,39 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -373,9 +373,32 @@ static void cfi_fixup_major_minor(struct
+@@ -371,9 +371,34 @@ static struct cfi_fixup fixup_table[] =
+ static void cfi_fixup_major_minor(struct cfi_private *cfi,
+ 				  struct cfi_pri_amdstd *extp)
  {
- 	// manufacturers defined in include/linux/mtd/cfi.h
- 
 -	if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
 -	    extp->MajorVersion == '0')
+-		extp->MajorVersion = '1';
++	/* Manufacturers are defined in include/linux/mtd/cfi.h */
++
 +	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 == '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 &&
-+	    extp->MajorVersion == '3' && extp->MinorVersion == '3') {
-+		printk(KERN_NOTICE "  Newer Samsung flash detected, "
-+		       "should be compatibile with Amd/Fujitsu.\n");
++		extp->MajorVersion == '3' && extp->MinorVersion == '3') {
++			printk(KERN_NOTICE "  Newer Samsung flash detected, "
++				"should be compatible with Amd/Fujitsu.\n");
 +
-+		printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
-+		       extp->MajorVersion, extp->MinorVersion);
++			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->MinorVersion = '3';
++			extp->MajorVersion = '1';	// set to 1.3
++			extp->MinorVersion = '3';
 +
-+		printk(" to %c.%c.\n",
-+		       extp->MajorVersion, extp->MinorVersion);
++			printk(" to %c.%c.\n",
++				extp->MajorVersion, extp->MinorVersion);
 +	}
  }