From 4fbed1fb84e7e50815d81a7563a4281b76833b1d Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Tue, 24 Apr 2012 17:56:29 +0200
Subject: [PATCH] --- yaml --- r: 307947 b: refs/heads/master c:
 0e9f480bb553d39ee06ccd45639ba7a5446a7b81 h: refs/heads/master i:   307945:
 6996d4ec456a4a13a10da430d6ae3948946d1386   307943:
 d165301404221d2282248dad65748468f44f68c0 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/mmc/core/cd-gpio.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3d97d06b0e7b..fb8de2ccf5cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dd1bfeb6cc89467261cc62ca81e0ac5da78ec0a
+refs/heads/master: 0e9f480bb553d39ee06ccd45639ba7a5446a7b81
diff --git a/trunk/drivers/mmc/core/cd-gpio.c b/trunk/drivers/mmc/core/cd-gpio.c
index 2c14be73254c..f13e38deceac 100644
--- a/trunk/drivers/mmc/core/cd-gpio.c
+++ b/trunk/drivers/mmc/core/cd-gpio.c
@@ -73,6 +73,9 @@ void mmc_cd_gpio_free(struct mmc_host *host)
 {
 	struct mmc_cd_gpio *cd = host->hotplug.handler_priv;
 
+	if (!cd)
+		return;
+
 	free_irq(host->hotplug.irq, host);
 	gpio_free(cd->gpio);
 	kfree(cd);