1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index 1b00dac3d7d6..98f8fd1c6375 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -93,13 +93,15 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
                         ret = onenand_do_read_oob(mtd, from + j * mtd->writesize + bd->offs,
                                                   readlen, &retlen, &buf[0]);
 
-                        if (ret)
+                        /* If it is a initial bad block, just ignore it */
+                        if (ret && !(ret & ONENAND_CTRL_LOAD))
                                 return ret;
 
                         if (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);
+                                mtd->ecc_stats.badblocks++;
                                 break;
                         }
                 }
@@ -177,14 +179,12 @@ int onenand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
         int len, ret = 0;
 
         len = mtd->size >> (this->erase_shift + 2);
-        /* Allocate memory (2bit per block) */
-        bbm->bbt = kmalloc(len, GFP_KERNEL);
+        /* Allocate memory (2bit per block) and clear the memory bad block table */
+        bbm->bbt = kzalloc(len, GFP_KERNEL);
         if (!bbm->bbt) {
                 printk(KERN_ERR "onenand_scan_bbt: Out of memory\n");
                 return -ENOMEM;
         }
-        /* Clear the memory bad block table */
-        memset(bbm->bbt, 0x00, len);
 
         /* Set the bad block position */
         bbm->badblockpos = ONENAND_BADBLOCK_POS;
@@ -230,14 +230,12 @@ int onenand_default_bbt(struct mtd_info *mtd)
         struct onenand_chip *this = mtd->priv;
         struct bbm_info *bbm;
 
-        this->bbm = kmalloc(sizeof(struct bbm_info), GFP_KERNEL);
+        this->bbm = kzalloc(sizeof(struct bbm_info), GFP_KERNEL);
         if (!this->bbm)
                 return -ENOMEM;
 
         bbm = this->bbm;
 
-        memset(bbm, 0, sizeof(struct bbm_info));
-
         /* 1KB page has same configuration as 2KB page */
         if (!bbm->badblock_pattern)
                 bbm->badblock_pattern = &largepage_memorybased;