linux/generic: fix a mistake in 2.6.37/089-mtd-samsung-flash.patch. (thank you maddes)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23957 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Alexandros C. Couloumbis 2010-11-11 14:57:58 +00:00
parent 5f9d5bcfb6
commit 0b60059858
1 changed files with 11 additions and 16 deletions

View File

@ -1,24 +1,17 @@
--- 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->MajorVersion = '1';
+ extp->MinorVersion = '0';
+
+ printk(" to %c.%c.\n",
@ -38,6 +31,8 @@
+
+ printk(" to %c.%c.\n",
+ extp->MajorVersion, extp->MinorVersion);
}
}
+ }
+
/*
* SST 38VF640x chips report major=0xFF / minor=0xFF.
*/