From 569472329a1b96083985242815871a2071dc83eb Mon Sep 17 00:00:00 2001
From: Daniel Ribeiro <drwyrm@gmail.com>
Date: Sun, 17 May 2009 08:02:17 -0300
Subject: [PATCH] --- yaml --- r: 153791 b: refs/heads/master c:
 ec2d0d842577854eee18f0dc06bd48fe17189b54 h: refs/heads/master i:   153789:
 bb01374556817203ce103f0556428e0e070fb824   153787:
 3dc2692ecfe0c4916e9925f964c318c8297716dd   153783:
 946a3ecacbdded72b87ee67b999e066db037a427   153775:
 4cfc48df01561e71bb730754611c851878f6b329   153759:
 5064963a1cde870fa50c0fab1af3c1bf7db7b539   153727:
 79896b63d2c658a4784006b440c64ac36558518f v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/mtd/chips/cfi_cmdset_0001.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e7dc0024f422..cef3f2966143 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6fed9e9fc5eefae5be0ecf222bac7e7496e8e74
+refs/heads/master: ec2d0d842577854eee18f0dc06bd48fe17189b54
diff --git a/trunk/drivers/mtd/chips/cfi_cmdset_0001.c b/trunk/drivers/mtd/chips/cfi_cmdset_0001.c
index c240454fd113..e772803b4959 100644
--- a/trunk/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/trunk/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -46,6 +46,7 @@
 #define MANUFACTURER_INTEL	0x0089
 #define I82802AB	0x00ad
 #define I82802AC	0x00ac
+#define PF38F4476	0x881c
 #define MANUFACTURER_ST         0x0020
 #define M50LPW080       0x002F
 #define M50FLW080A	0x0080
@@ -315,9 +316,18 @@ static struct cfi_fixup fixup_table[] = {
 	{ 0, 0, NULL, NULL }
 };
 
+static void cfi_fixup_major_minor(struct cfi_private *cfi,
+						struct cfi_pri_intelext *extp)
+{
+	if (cfi->mfr == MANUFACTURER_INTEL &&
+			cfi->id == PF38F4476 && extp->MinorVersion == '3')
+		extp->MinorVersion = '1';
+}
+
 static inline struct cfi_pri_intelext *
 read_pri_intelext(struct map_info *map, __u16 adr)
 {
+	struct cfi_private *cfi = map->fldrv_priv;
 	struct cfi_pri_intelext *extp;
 	unsigned int extp_size = sizeof(*extp);
 
@@ -326,6 +336,8 @@ read_pri_intelext(struct map_info *map, __u16 adr)
 	if (!extp)
 		return NULL;
 
+	cfi_fixup_major_minor(cfi, extp);
+
 	if (extp->MajorVersion != '1' ||
 	    (extp->MinorVersion < '0' || extp->MinorVersion > '5')) {
 		printk(KERN_ERR "  Unknown Intel/Sharp Extended Query "