3 files changed, 10 insertions, 11 deletions

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index fff665d59a0d..89b9d6891532 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1571,8 +1571,8 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
         xip_enable(map, chip, adr);
         /* FIXME - should have reset delay before continuing */
 
-        printk(KERN_WARNING "MTD %s(): software timeout\n",
-               __func__ );
+        printk(KERN_WARNING "MTD %s(): software timeout, address:0x%.8lx.\n",
+               __func__, adr);
 
         ret = -EIO;
  op_done:
diff --git a/drivers/mtd/chips/gen_probe.c b/drivers/mtd/chips/gen_probe.c
index 74dbb6bcf488..ffb36ba8a6e0 100644
--- a/drivers/mtd/chips/gen_probe.c
+++ b/drivers/mtd/chips/gen_probe.c
@@ -211,9 +211,7 @@ static inline struct mtd_info *cfi_cmdset_unknown(struct map_info *map,
 
         probe_function = __symbol_get(probename);
         if (!probe_function) {
-                char modname[sizeof("cfi_cmdset_%4.4X")];
-                sprintf(modname, "cfi_cmdset_%4.4X", type);
-                request_module(modname);
+                request_module("cfi_cmdset_%4.4X", type);
                 probe_function = __symbol_get(probename);
         }
 
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index c443f527a53a..7c0b27d132b1 100644
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -120,7 +120,7 @@
 #define PM49FL008       0x006A
 
 /* Sharp */
-#define LH28F640BF      0x00b0
+#define LH28F640BF      0x00B0
 
 /* ST - www.st.com */
 #define M29F800AB       0x0058
@@ -1299,13 +1299,14 @@ static const struct amd_flash_info jedec_table[] = {
                 .mfr_id         = CFI_MFR_SHARP,
                 .dev_id         = LH28F640BF,
                 .name           = "LH28F640BF",
-                .devtypes       = CFI_DEVICETYPE_X8,
+                .devtypes       = CFI_DEVICETYPE_X16,
                 .uaddr          = MTD_UADDR_UNNECESSARY,
-                .dev_size       = SIZE_4MiB,
-                .cmd_set        = P_ID_INTEL_STD,
-                .nr_regions     = 1,
+                .dev_size       = SIZE_8MiB,
+                .cmd_set        = P_ID_INTEL_EXT,
+                .nr_regions     = 2,
                 .regions        = {
-                        ERASEINFO(0x40000,16),
+                        ERASEINFO(0x10000, 127),
+                        ERASEINFO(0x02000, 8),
                 }
         }, {
                 .mfr_id         = CFI_MFR_SST,