commit 896937ad5c8a1f7264b43b79c0bac2bd8d993ece
author Uli Luckas <u.luckas@road-gmbh.de> Mon Nov 07 21:22:07 2005 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Mon Nov 07 21:22:07 2005 +0000
tree 0ef8a66fd172980f01dcf6bd08b293cd931d7e8b
parent 0b154bb7d0cce80e9c0bcf11d4f9e71b59409d26

[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>

drivers/mmc/mmc.c

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