Merge branch 'linus'

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/ppc/platforms/ev64360.c b/arch/ppc/platforms/ev64360.c
index 90ed375c9b90..f87e06f6bab9 100644
--- a/arch/ppc/platforms/ev64360.c
+++ b/arch/ppc/platforms/ev64360.c
@@ -358,13 +358,12 @@ ev64360_setup_mtd(void)
 
         ptbl_entries = 3;
 
-        if ((ptbl = kmalloc(ptbl_entries * sizeof(struct mtd_partition),
+        if ((ptbl = kzalloc(ptbl_entries * sizeof(struct mtd_partition),
                 GFP_KERNEL)) == NULL) {
 
                 printk(KERN_WARNING "Can't alloc MTD partition table\n");
                 return -ENOMEM;
         }
-        memset(ptbl, 0, ptbl_entries * sizeof(struct mtd_partition));
 
         ptbl[0].name = "reserved";
         ptbl[0].offset = 0;