From 48daf6389f422651d5b1ef81e4224c5b7024c243 Mon Sep 17 00:00:00 2001
From: Michal Miroslaw <mirq-linux@rere.qmqm.pl>
Date: Thu, 2 Dec 2010 23:38:12 +0100
Subject: [PATCH] --- yaml --- r: 228901 b: refs/heads/master c:
 e6f29a8dc1602e170daf955233891a9130573a55 h: refs/heads/master i:   228899:
 a5c3f8289baeaaa46cace10fc872724485882c49 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/mmc/core/core.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c51f51f7239c..696ab59a070a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 080bc9774b6f1e3866747b18631bad26f47c22ce
+refs/heads/master: e6f29a8dc1602e170daf955233891a9130573a55
diff --git a/trunk/drivers/mmc/core/core.c b/trunk/drivers/mmc/core/core.c
index 241ffb28351c..97e0624eb9b6 100644
--- a/trunk/drivers/mmc/core/core.c
+++ b/trunk/drivers/mmc/core/core.c
@@ -1569,6 +1569,11 @@ void mmc_rescan(struct work_struct *work)
 				 * Try SDMEM (but not MMC) even if SDIO
 				 * is broken.
 				 */
+				mmc_power_up(host);
+				sdio_reset(host);
+				mmc_go_idle(host);
+				mmc_send_if_cond(host, host->ocr_avail);
+
 				if (mmc_send_app_op_cond(host, 0, &ocr))
 					goto out_fail;