From e8e9b35bcca2f06a3d1abb316861ffcb6ae96f19 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <drzeus@drzeus.cx>
Date: Sat, 28 Apr 2007 17:30:50 +0200
Subject: [PATCH] --- yaml --- r: 53577 b: refs/heads/master c:
 b5af25bee2de2f6cd1ac74ba737cbc4f3d303e5d h: refs/heads/master i:   53575:
 f519e2589995b0440920c9bd54369a1ab70b7bcc v: v3

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

diff --git a/[refs] b/[refs]
index ccd85c4de362..d216d10f8521 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2b46f66b4b342be07a4194bd5e82384d07e470d
+refs/heads/master: b5af25bee2de2f6cd1ac74ba737cbc4f3d303e5d
diff --git a/trunk/drivers/mmc/mmc.c b/trunk/drivers/mmc/mmc.c
index 0242c6a21daf..94c04725726d 100644
--- a/trunk/drivers/mmc/mmc.c
+++ b/trunk/drivers/mmc/mmc.c
@@ -1738,10 +1738,17 @@ EXPORT_SYMBOL(mmc_free_host);
  */
 int mmc_suspend_host(struct mmc_host *host, pm_message_t state)
 {
-	mmc_claim_host(host);
-	mmc_deselect_cards(host);
+	struct list_head *l, *n;
+
+	mmc_flush_scheduled_work();
+
+	list_for_each_safe(l, n, &host->cards) {
+		struct mmc_card *card = mmc_list_to_card(l);
+
+		mmc_remove_card(card);
+	}
+
 	mmc_power_off(host);
-	mmc_release_host(host);
 
 	return 0;
 }