mmc: remove card upon suspend

Suspending MMC/SD cards (versus removing and readding them) is an
inherently unsafe operation and has even been broken for some time.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 0242c6a21daf67..94c04725726d24 100644
--- a/drivers/mmc/mmc.c
+++ b/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;
 }