---

yaml --- r: 298806 b: refs/heads/master c: d59d77e h: refs/heads/master v: v3
git-mirror · Apr 6, 2012 · 1b06a2b · 1b06a2b
1 parent 990af6e
commit 1b06a2b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e841a7c69b708eeaf784fd517978006e8319b03a
+refs/heads/master: d59d77ed1e0cdd254f99260013b27d64dc1dffac
diff --git a/trunk/drivers/mmc/host/omap_hsmmc.c b/trunk/drivers/mmc/host/omap_hsmmc.c
@@ -2018,8 +2018,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
 err_irq_cd_init:
 	free_irq(host->irq, host);
 err_irq:
-	pm_runtime_mark_last_busy(host->dev);
-	pm_runtime_put_autosuspend(host->dev);
+	pm_runtime_put_sync(host->dev);
 	pm_runtime_disable(host->dev);
 	clk_put(host->fclk);
 	if (host->got_dbclk) {