---

yaml --- r: 297342 b: refs/heads/master c: 37f6190 h: refs/heads/master v: v3
git-mirror · Mar 27, 2012 · a001b7f · a001b7f
1 parent 01c209f
commit a001b7f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 956d9fd5eb3cbb322440844ed341145707bd71f8
+refs/heads/master: 37f6190d54f4d90b886784fadbb9cf82d5c8b1ef
diff --git a/trunk/drivers/mmc/host/omap_hsmmc.c b/trunk/drivers/mmc/host/omap_hsmmc.c
@@ -1935,6 +1935,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
 err_irq:
 	pm_runtime_mark_last_busy(host->dev);
 	pm_runtime_put_autosuspend(host->dev);
+	pm_runtime_disable(host->dev);
 	clk_put(host->fclk);
 	if (host->got_dbclk) {
 		clk_disable(host->dbclk);