3 files changed, 22 insertions, 16 deletions

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 95c13b2ffa79..ffa288474820 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -426,15 +426,6 @@ int add_mtd_device(struct mtd_info *mtd)
         mtd->erasesize_mask = (1 << mtd->erasesize_shift) - 1;
         mtd->writesize_mask = (1 << mtd->writesize_shift) - 1;
 
-        if (mtd->dev.parent) {
-                if (!mtd->owner && mtd->dev.parent->driver)
-                        mtd->owner = mtd->dev.parent->driver->owner;
-                if (!mtd->name)
-                        mtd->name = dev_name(mtd->dev.parent);
-        } else {
-                pr_debug("mtd device won't show a device symlink in sysfs\n");
-        }
-
         /* Some chips always power up locked. Unlock them now */
         if ((mtd->flags & MTD_WRITEABLE) && (mtd->flags & MTD_POWERUP_LOCK)) {
                 error = mtd_unlock(mtd, 0, mtd->size);
@@ -549,6 +540,21 @@ static int mtd_add_device_partitions(struct mtd_info *mtd,
         return 0;
 }
 
+/*
+ * Set a few defaults based on the parent devices, if not provided by the
+ * driver
+ */
+static void mtd_set_dev_defaults(struct mtd_info *mtd)
+{
+        if (mtd->dev.parent) {
+                if (!mtd->owner && mtd->dev.parent->driver)
+                        mtd->owner = mtd->dev.parent->driver->owner;
+                if (!mtd->name)
+                        mtd->name = dev_name(mtd->dev.parent);
+        } else {
+                pr_debug("mtd device won't show a device symlink in sysfs\n");
+        }
+}
 
 /**
  * mtd_device_parse_register - parse partitions and register an MTD device.
@@ -587,6 +593,8 @@ int mtd_device_parse_register(struct mtd_info *mtd, const char * const *types,
         int ret;
         struct mtd_partition *real_parts = NULL;
 
+        mtd_set_dev_defaults(mtd);
+
         ret = parse_mtd_partitions(mtd, types, &real_parts, parser_data);
         if (ret <= 0 && nr_parts && parts) {
                 real_parts = kmemdup(parts, sizeof(*parts) * nr_parts,
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 49883905a434..32477c4eb421 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -516,8 +516,8 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len)
         status_old = read_sr(nor);
 
         /* Cannot unlock; would unlock larger region than requested */
-        if (stm_is_locked_sr(nor, status_old, ofs - mtd->erasesize,
-                             mtd->erasesize))
+        if (stm_is_locked_sr(nor, ofs - mtd->erasesize, mtd->erasesize,
+                             status_old))
                 return -EINVAL;
 
         /*
@@ -1200,8 +1200,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
 
         if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
             JEDEC_MFR(info) == SNOR_MFR_INTEL ||
-            JEDEC_MFR(info) == SNOR_MFR_SST ||
-            JEDEC_MFR(info) == SNOR_MFR_WINBOND) {
+            JEDEC_MFR(info) == SNOR_MFR_SST) {
                 write_enable(nor);
                 write_sr(nor, 0);
         }
@@ -1217,8 +1216,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
         mtd->_read = spi_nor_read;
 
         /* NOR protection support for STmicro/Micron chips and similar */
-        if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||
-            JEDEC_MFR(info) == SNOR_MFR_WINBOND) {
+        if (JEDEC_MFR(info) == SNOR_MFR_MICRON) {
                 nor->flash_lock = stm_lock;
                 nor->flash_unlock = stm_unlock;
                 nor->flash_is_locked = stm_is_locked;
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
index c8723b62c4cd..bc742dac7d3a 100644
--- a/include/linux/mtd/spi-nor.h
+++ b/include/linux/mtd/spi-nor.h
@@ -25,7 +25,7 @@
 #define SNOR_MFR_MACRONIX       CFI_MFR_MACRONIX
 #define SNOR_MFR_SPANSION       CFI_MFR_AMD
 #define SNOR_MFR_SST            CFI_MFR_SST
-#define SNOR_MFR_WINBOND        0xef
+#define SNOR_MFR_WINBOND        0xef /* Also used by some Spansion */
 
 /*
  * Note on opcode nomenclature: some opcodes have a format like