linux/generic: fix a mistake in 2.6.37/089-mtd-samsung-flash.patch. (thank you maddes)
SVN-Revision: 23957
This commit is contained in:
parent
7fb5461594
commit
caaa492551
@ -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 &&
|
||||
@ -33,11 +26,13 @@
|
||||
+ 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.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user