diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-23 21:36:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-23 21:36:13 -0700 |
| commit | 1ff6f3dbfb366b464869d3558406e498cb3e1159 (patch) | |
| tree | 3265b96ac28c297adc6f24b1fb22454aa9b7b1ac /drivers/mmc/core/host.c | |
| parent | 2b56fec64faae9fc5c3e61bbfb851b7985292cd5 (diff) | |
| parent | b67ac3f339c76dfea3cc75fc0285b6d13edc35fa (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
sdhci: tell which spurious interrupt we got
sdhci: handle data interrupts during command
mmc: ignore bad max block size in sdhci
sdhci: be more cautious about block count register
drivers/mmc/core/host.c: kmalloc + memset conversion to kzalloc
drivers/mmc/core/bus.c: kmalloc + memset conversion to kzalloc
Diffstat (limited to 'drivers/mmc/core/host.c')
| -rw-r--r-- | drivers/mmc/core/host.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 6a7e2984960..2c7ce8f43a9 100644 --- a/drivers/mmc/core/host.c +++ b/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; |