X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f2e717e983d1701dd51a0fc4c01b61418f6c43ff..9de5c06f89388ac423e517df31d3fdd83f306097:/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch?ds=inline

diff --git a/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch b/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch
index 9b38ee4ce..9b8cc815a 100644
--- a/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch
+++ b/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch
@@ -1,32 +1,35 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -394,9 +394,33 @@ static void cfi_fixup_major_minor(struct
+@@ -392,9 +392,35 @@ 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 = '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");
++				"should be compatible with Amd/Fujitsu.\n");
 +
 +			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
 +			extp->MinorVersion = '3';
 +
 +			printk(" to %c.%c.\n",