From d27e582bc9ae650b72bef71588e5e526a4751935 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Wed, 7 Sep 2011 10:22:09 +0100
Subject: [PATCH] --- yaml --- r: 270259 b: refs/heads/master c:
 041beb1d531f538bf62377e2ca2b4ecbaa479d75 h: refs/heads/master i:   270257:
 b33b651e1163ddce36ee63077f7e4d9e1097802b   270255:
 4edc30440021d30b4bc351082b4d8f783a74bc21 v: v3

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

diff --git a/[refs] b/[refs]
index 79bfa505ef72..88bfc12c604d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55cd65e48b62c6f08edbb93d5cadf96e876ebcc2
+refs/heads/master: 041beb1d531f538bf62377e2ca2b4ecbaa479d75
diff --git a/trunk/drivers/mmc/core/core.c b/trunk/drivers/mmc/core/core.c
index 557856b6f95c..7289e999d1fc 100644
--- a/trunk/drivers/mmc/core/core.c
+++ b/trunk/drivers/mmc/core/core.c
@@ -1214,6 +1214,13 @@ static void mmc_power_off(struct mmc_host *host)
 	host->ios.timing = MMC_TIMING_LEGACY;
 	mmc_set_ios(host);
 
+	/*
+	 * Some configurations, such as the 802.11 SDIO card in the OLPC
+	 * XO-1.5, require a short delay after poweroff before the card
+	 * can be successfully turned on again.
+	 */
+	mmc_delay(1);
+
 	mmc_host_clk_release(host);
 }