1 files changed, 15 insertions, 12 deletions

diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index 98f8fd1c637..aecdd50a178 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -17,8 +17,8 @@
 #include <linux/mtd/onenand.h>
 #include <linux/mtd/compatmac.h>
 
-extern int onenand_do_read_oob(struct mtd_info *mtd, loff_t from, size_t len,
-                               size_t *retlen, u_char *buf);
+extern int onenand_bbt_read_oob(struct mtd_info *mtd, loff_t from,
+                                struct mtd_oob_ops *ops);
 
 /**
  * check_short_pattern - [GENERIC] check if a pattern is in the buffer
@@ -65,10 +65,11 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
         int startblock;
         loff_t from;
         size_t readlen, ooblen;
+        struct mtd_oob_ops ops;
 
         printk(KERN_INFO "Scanning device for bad blocks\n");
 
-        len = 1;
+        len = 2;
 
         /* We need only read few bytes from the OOB area */
         scanlen = ooblen = 0;
@@ -82,22 +83,24 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
         startblock = 0;
         from = 0;
 
+        ops.mode = MTD_OOB_PLACE;
+        ops.ooblen = readlen;
+        ops.oobbuf = buf;
+        ops.len = ops.ooboffs = ops.retlen = ops.oobretlen = 0;
+
         for (i = startblock; i < numblocks; ) {
                 int ret;
 
                 for (j = 0; j < len; j++) {
-                        size_t retlen;
-
                         /* No need to read pages fully,
                          * just read required OOB bytes */
-                        ret = onenand_do_read_oob(mtd, from + j * mtd->writesize + bd->offs,
-                                                  readlen, &retlen, &buf[0]);
+                        ret = onenand_bbt_read_oob(mtd, from + j * mtd->writesize + bd->offs, &ops);
 
                         /* If it is a initial bad block, just ignore it */
-                        if (ret && !(ret & ONENAND_CTRL_LOAD))
-                                return ret;
+                        if (ret == ONENAND_BBT_READ_FATAL_ERROR)
+                                return -EIO;
 
-                        if (check_short_pattern(&buf[j * scanlen], scanlen, mtd->writesize, bd)) {
+                        if (ret || check_short_pattern(&buf[j * scanlen], scanlen, mtd->writesize, bd)) {
                                 bbm->bbt[i >> 3] |= 0x03 << (i & 0x6);
                                 printk(KERN_WARNING "Bad eraseblock %d at 0x%08x\n",
                                         i >> 1, (unsigned int) from);
@@ -168,8 +171,8 @@ static int onenand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt)
  * marked good / bad blocks and writes the bad block table(s) to
  * the selected place.
  *
- * The bad block table memory is allocated here. It must be freed
- * by calling the onenand_free_bbt function.
+ * The bad block table memory is allocated here. It is freed
+ * by the onenand_release function.
  *
  */
 int onenand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)