Merge master.kernel.org:/home/rmk/linux-2.6-mmc

254ce8dc · Linus Torvalds · 89de09a9 · 896937ad · 254ce8dc
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

drivers/mmc/mmc.c drivers/mmc/mmc.c +1 -1

未找到文件。
--- 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;
 }