mtd: do not use mtd->lock, unlock and is_locked directly

Instead, call the corresponding MTD API function which will return
'-EOPNOTSUPP' if the operation is not supported.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 4d0f3e557bd1..66494ee5355a 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -339,9 +339,9 @@ int add_mtd_device(struct mtd_info *mtd)
         mtd->writesize_mask = (1 << mtd->writesize_shift) - 1;
 
         /* Some chips always power up locked. Unlock them now */
-        if ((mtd->flags & MTD_WRITEABLE)
-            && (mtd->flags & MTD_POWERUP_LOCK) && mtd->unlock) {
-                if (mtd_unlock(mtd, 0, mtd->size))
+        if ((mtd->flags & MTD_WRITEABLE) && (mtd->flags & MTD_POWERUP_LOCK)) {
+                error = mtd_unlock(mtd, 0, mtd->size);
+                if (error && error != -EOPNOTSUPP)
                         printk(KERN_WARNING
                                "%s: unlock failed, writes may not work\n",
                                mtd->name);