diff options
Diffstat (limited to 'drivers/mtd/mtdconcat.c')
-rw-r--r-- | drivers/mtd/mtdconcat.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c index cf927a8803e7..ec51483b1c51 100644 --- a/drivers/mtd/mtdconcat.c +++ b/drivers/mtd/mtdconcat.c | |||
@@ -708,14 +708,13 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to c | |||
708 | 708 | ||
709 | /* allocate the device structure */ | 709 | /* allocate the device structure */ |
710 | size = SIZEOF_STRUCT_MTD_CONCAT(num_devs); | 710 | size = SIZEOF_STRUCT_MTD_CONCAT(num_devs); |
711 | concat = kmalloc(size, GFP_KERNEL); | 711 | concat = kzalloc(size, GFP_KERNEL); |
712 | if (!concat) { | 712 | if (!concat) { |
713 | printk | 713 | printk |
714 | ("memory allocation error while creating concatenated device \"%s\"\n", | 714 | ("memory allocation error while creating concatenated device \"%s\"\n", |
715 | name); | 715 | name); |
716 | return NULL; | 716 | return NULL; |
717 | } | 717 | } |
718 | memset(concat, 0, size); | ||
719 | concat->subdev = (struct mtd_info **) (concat + 1); | 718 | concat->subdev = (struct mtd_info **) (concat + 1); |
720 | 719 | ||
721 | /* | 720 | /* |