Update broken web addresses in the kernel.

[mirror_ubuntu-artful-kernel.git] / drivers / mtd / chips / cfi_cmdset_0002.c

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index d81079ef91a538c20fa97f891df13db2958b36b5..ba29d2f0ffd77dc6b42bfa55acdcbf0bf97aacea 100644 (file)
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -33,7 +33,6 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/reboot.h>
-#include <linux/mtd/compatmac.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/cfi.h>
@@ -417,16 +416,26 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
                         */
                        cfi_fixup_major_minor(cfi, extp);
 
+                       /*
+                        * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4
+                        * see: http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19 
+                        *      http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf
+                        *      http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf
+                        */
                        if (extp->MajorVersion != '1' ||
-                           (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
+                           (extp->MajorVersion == '1' && (extp->MinorVersion < '0' || extp->MinorVersion > '4'))) {
                                printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
-                                      "version %c.%c.\n",  extp->MajorVersion,
-                                      extp->MinorVersion);
+                                      "version %c.%c (%#02x/%#02x).\n",
+                                      extp->MajorVersion, extp->MinorVersion,
+                                      extp->MajorVersion, extp->MinorVersion);
                                kfree(extp);
                                kfree(mtd);
                                return NULL;
                        }
 
+                       printk(KERN_INFO "  Amd/Fujitsu Extended Query version %c.%c.\n",
+                              extp->MajorVersion, extp->MinorVersion);
+
                        /* Install our own private info structure */
                        cfi->cmdset_priv = extp;