From: Uli Luckas <u.luckas@road-gmbh.de>
Date: Mon, 7 Nov 2005 21:22:07 +0000 (+0000)
Subject: [ARM] 3120/1: Fix MMC/SD card driver resume deadlock
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=896937ad5c8a1f7264b43b79c0bac2bd8d993ece;p=linux-beck.git

[ARM] 3120/1: Fix MMC/SD card driver resume deadlock

Patch from Uli Luckas

This is a simplification of patch 3116/1 as sugested by Russell King.

Signed-off-by: Uli Luckas <u.luckas@road-gmbh.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index ceae379a4d4c..da528390acf8 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1263,7 +1263,7 @@ EXPORT_SYMBOL(mmc_suspend_host);
  */
 int mmc_resume_host(struct mmc_host *host)
 {
-	mmc_detect_change(host, 0);
+	mmc_rescan(host);
 
 	return 0;
 }