diff --git a/[refs] b/[refs] index 6739c3ca833f..5ac1dae698c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 733cb1e44047ed88f97754fbfd5173741b6dca1a +refs/heads/master: be760a9de881d84994403bb93177bcb95319c4cb diff --git a/trunk/drivers/mmc/core/host.c b/trunk/drivers/mmc/core/host.c index 6a7e29849603..2c7ce8f43a9a 100644 --- a/trunk/drivers/mmc/core/host.c +++ b/trunk/drivers/mmc/core/host.c @@ -58,12 +58,10 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) { struct mmc_host *host; - host = kmalloc(sizeof(struct mmc_host) + extra, GFP_KERNEL); + host = kzalloc(sizeof(struct mmc_host) + extra, GFP_KERNEL); if (!host) return NULL; - memset(host, 0, sizeof(struct mmc_host) + extra); - host->parent = dev; host->class_dev.parent = dev; host->class_dev.class = &mmc_host_class;