[MTD] [OneNAND] Synchronize block locking operations

Ensure OneNAND's block locking operations are synchronized
like all other operations.

Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

1 files changed, 14 insertions, 4 deletions

diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index b2c40f67db83..f633941011a5 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -1904,7 +1904,12 @@ static int onenand_do_lock_cmd(struct mtd_info *mtd, loff_t ofs, size_t len, int
  */
 static int onenand_lock(struct mtd_info *mtd, loff_t ofs, size_t len)
 {
-        return onenand_do_lock_cmd(mtd, ofs, len, ONENAND_CMD_LOCK);
+        int ret;
+
+        onenand_get_device(mtd, FL_LOCKING);
+        ret = onenand_do_lock_cmd(mtd, ofs, len, ONENAND_CMD_LOCK);
+        onenand_release_device(mtd);
+        return ret;
 }
 
 /**
@@ -1917,7 +1922,12 @@ static int onenand_lock(struct mtd_info *mtd, loff_t ofs, size_t len)
  */
 static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
 {
-        return onenand_do_lock_cmd(mtd, ofs, len, ONENAND_CMD_UNLOCK);
+        int ret;
+
+        onenand_get_device(mtd, FL_LOCKING);
+        ret = onenand_do_lock_cmd(mtd, ofs, len, ONENAND_CMD_UNLOCK);
+        onenand_release_device(mtd);
+        return ret;
 }
 
 /**
@@ -1979,7 +1989,7 @@ static int onenand_unlock_all(struct mtd_info *mtd)
                         loff_t ofs = this->chipsize >> 1;
                         size_t len = mtd->erasesize;
 
-                        onenand_unlock(mtd, ofs, len);
+                        onenand_do_lock_cmd(mtd, ofs, len, ONENAND_CMD_UNLOCK);
                 }
 
                 onenand_check_lock_status(this);
@@ -1987,7 +1997,7 @@ static int onenand_unlock_all(struct mtd_info *mtd)
                 return 0;
         }
 
-        onenand_unlock(mtd, 0x0, this->chipsize);
+        onenand_do_lock_cmd(mtd, 0x0, this->chipsize, ONENAND_CMD_UNLOCK);
 
         return 0;
 }