From 0aa4fa843b36e6bf38b9d86376db54efcac0658a Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Tue, 20 Nov 2012 14:43:16 +0530
Subject: [PATCH] --- yaml --- r: 336314 b: refs/heads/master c:
 4c42d6cc245e8d41eb83c724cf38cdb9342ea5ba h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4512822c5dea..b25c0c31be38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3af31c6c61fd036af459e5d3c1260a6cbb7810e
+refs/heads/master: 4c42d6cc245e8d41eb83c724cf38cdb9342ea5ba
diff --git a/trunk/drivers/mmc/core/sdio_bus.c b/trunk/drivers/mmc/core/sdio_bus.c
index fc2d94a3b60c..5e57048e2c1d 100644
--- a/trunk/drivers/mmc/core/sdio_bus.c
+++ b/trunk/drivers/mmc/core/sdio_bus.c
@@ -272,8 +272,7 @@ static void sdio_release_func(struct device *dev)
 
 	sdio_free_func_cis(func);
 
-	if (func->info)
-		kfree(func->info);
+	kfree(func->info);
 
 	kfree(func);
 }