From 00fad89cf49c438e20d345bc02e48ceed519ae4d Mon Sep 17 00:00:00 2001
From: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Date: Wed, 1 Aug 2007 00:05:24 +0200
Subject: [PATCH] --- yaml --- r: 65630 b: refs/heads/master c:
 9f2fcf99394b34769e3243a7f42a0ba8d21fc774 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/mmc/core/sdio_bus.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ba2af6c9a1b4..fc6a1486c2a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb6594689226663968ef0a9fd71ec5e1e4e04f9c
+refs/heads/master: 9f2fcf99394b34769e3243a7f42a0ba8d21fc774
diff --git a/trunk/drivers/mmc/core/sdio_bus.c b/trunk/drivers/mmc/core/sdio_bus.c
index fcb13fb0daad..683d91740109 100644
--- a/trunk/drivers/mmc/core/sdio_bus.c
+++ b/trunk/drivers/mmc/core/sdio_bus.c
@@ -221,12 +221,10 @@ struct sdio_func *sdio_alloc_func(struct mmc_card *card)
 {
 	struct sdio_func *func;
 
-	func = kmalloc(sizeof(struct sdio_func), GFP_KERNEL);
+	func = kzalloc(sizeof(struct sdio_func), GFP_KERNEL);
 	if (!func)
 		return ERR_PTR(-ENOMEM);
 
-	memset(func, 0, sizeof(struct sdio_func));
-
 	func->card = card;
 
 	device_initialize(&func->dev);