2 files changed, 14 insertions, 8 deletions

diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 14a49abe057e..f591f615d3f6 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -629,6 +629,7 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
 {
         struct omap_onenand_platform_data *pdata;
         struct omap2_onenand *c;
+        struct onenand_chip *this;
         int r;
 
         pdata = pdev->dev.platform_data;
@@ -726,9 +727,8 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
 
         c->mtd.dev.parent = &pdev->dev;
 
+        this = &c->onenand;
         if (c->dma_channel >= 0) {
-                struct onenand_chip *this = &c->onenand;
-
                 this->wait = omap2_onenand_wait;
                 if (cpu_is_omap34xx()) {
                         this->read_bufferram = omap3_onenand_read_bufferram;
@@ -749,6 +749,9 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
                 c->onenand.disable = omap2_onenand_disable;
         }
 
+        if (pdata->skip_initial_unlocking)
+                this->options |= ONENAND_SKIP_INITIAL_UNLOCKING;
+
         if ((r = onenand_scan(&c->mtd, 1)) < 0)
                 goto err_release_regulator;
 
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index bac41caa8df7..56a8b2005bda 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -1132,6 +1132,8 @@ static int onenand_mlc_read_ops_nolock(struct mtd_info *mtd, loff_t from,
                         onenand_update_bufferram(mtd, from, !ret);
                         if (ret == -EBADMSG)
                                 ret = 0;
+                        if (ret)
+                                break;
                 }
 
                 this->read_bufferram(mtd, ONENAND_DATARAM, buf, column, thislen);
@@ -1646,11 +1648,10 @@ static int onenand_verify(struct mtd_info *mtd, const u_char *buf, loff_t addr,
         int ret = 0;
         int thislen, column;
 
+        column = addr & (this->writesize - 1);
+
         while (len != 0) {
-                thislen = min_t(int, this->writesize, len);
-                column = addr & (this->writesize - 1);
-                if (column + thislen > this->writesize)
-                        thislen = this->writesize - column;
+                thislen = min_t(int, this->writesize - column, len);
 
                 this->command(mtd, ONENAND_CMD_READ, addr, this->writesize);
 
@@ -1664,12 +1665,13 @@ static int onenand_verify(struct mtd_info *mtd, const u_char *buf, loff_t addr,
 
                 this->read_bufferram(mtd, ONENAND_DATARAM, this->verify_buf, 0, mtd->writesize);
 
-                if (memcmp(buf, this->verify_buf, thislen))
+                if (memcmp(buf, this->verify_buf + column, thislen))
                         return -EBADMSG;
 
                 len -= thislen;
                 buf += thislen;
                 addr += thislen;
+                column = 0;
         }
 
         return 0;
@@ -4083,7 +4085,8 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
         mtd->writebufsize = mtd->writesize;
 
         /* Unlock whole block */
-        this->unlock_all(mtd);
+        if (!(this->options & ONENAND_SKIP_INITIAL_UNLOCKING))
+                this->unlock_all(mtd);
 
         ret = this->scan_bbt(mtd);
         if ((!FLEXONENAND(this)) || ret)