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

Uli Luckas · Russell King · commit 896937ad5c8a · 2005-11-07T21:22:07.000Z
Patch from Uli Luckas

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

Signed-off-by: Uli Luckas &lt;u.luckas@road-gmbh.de&gt;
Signed-off-by: Russell King &lt;rmk+kernel@arm.linux.org.uk&gt;
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -1263,7 +1263,7 @@ EXPORT_SYMBOL(mmc_suspend_host);`
`1263`	`1263`	`*/`
`1264`	`1264`	`int mmc_resume_host(struct mmc_host *host)`
`1265`	`1265`	`{`
`1266`		`- mmc_detect_change(host, 0);`
	`1266`	`+ mmc_rescan(host);`
`1267`	`1267`
`1268`	`1268`	`return 0;`
`1269`	`1269`	`}`