3 files changed, 4 insertions, 9 deletions

diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index 6107f532855b..12608c13cce5 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -1635,13 +1635,12 @@ static int __init doc_probe(unsigned long physadr)
 
         len = sizeof(struct mtd_info) +
             sizeof(struct nand_chip) + sizeof(struct doc_priv) + (2 * sizeof(struct nand_bbt_descr));
-        mtd = kmalloc(len, GFP_KERNEL);
+        mtd = kzalloc(len, GFP_KERNEL);
         if (!mtd) {
                 printk(KERN_ERR "DiskOnChip kmalloc (%d bytes) failed!\n", len);
                 ret = -ENOMEM;
                 goto fail;
         }
-        memset(mtd, 0, len);
 
         nand                    = (struct nand_chip *) (mtd + 1);
         doc                     = (struct doc_priv *) (nand + 1);
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 4e74fe9af29e..5e121ceaa598 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -960,14 +960,12 @@ int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
         struct nand_bbt_descr *md = this->bbt_md;
 
         len = mtd->size >> (this->bbt_erase_shift + 2);
-        /* Allocate memory (2bit per block) */
-        this->bbt = kmalloc(len, GFP_KERNEL);
+        /* Allocate memory (2bit per block) and clear the memory bad block table */
+        this->bbt = kzalloc(len, GFP_KERNEL);
         if (!this->bbt) {
                 printk(KERN_ERR "nand_scan_bbt: Out of memory\n");
                 return -ENOMEM;
         }
-        /* Clear the memory bad block table */
-        memset(this->bbt, 0x00, len);
 
         /* If no primary table decriptor is given, scan the device
          * to build a memory based bad block table
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index abebcab47631..3d39451ae8f5 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -1511,14 +1511,12 @@ static int __init ns_init_module(void)
         }
 
         /* Allocate and initialize mtd_info, nand_chip and nandsim structures */
-        nsmtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip)
+        nsmtd = kzalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip)
                                 + sizeof(struct nandsim), GFP_KERNEL);
         if (!nsmtd) {
                 NS_ERR("unable to allocate core structures.\n");
                 return -ENOMEM;
         }
-        memset(nsmtd, 0, sizeof(struct mtd_info) + sizeof(struct nand_chip) +
-                        sizeof(struct nandsim));
         chip        = (struct nand_chip *)(nsmtd + 1);
         nsmtd->priv = (void *)chip;
         nand        = (struct nandsim *)(chip + 1);