Merge branch 'master' into upstream

1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 168d3ba063c3..c4d26de74349 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -57,6 +57,16 @@ int add_mtd_device(struct mtd_info *mtd)
                         mtd->index = i;
                         mtd->usecount = 0;
 
+                        /* Some chips always power up locked. Unlock them now */
+                        if ((mtd->flags & MTD_WRITEABLE)
+                            && (mtd->flags & MTD_STUPID_LOCK) && mtd->unlock) {
+                                if (mtd->unlock(mtd, 0, mtd->size))
+                                        printk(KERN_WARNING
+                                               "%s: unlock failed, "
+                                               "writes may not work\n",
+                                               mtd->name);
+                        }
+
                         DEBUG(0, "mtd: Giving out device %d to %s\n",i, mtd->name);
                         /* No need to get a refcount on the module containing
                            the notifier, since we hold the mtd_table_mutex */