From a001b7f02c272e7052c3db66dc2e9b79ec0e70ab Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Thu, 8 Mar 2012 23:41:35 -0500
Subject: [PATCH] --- yaml --- r: 297342 b: refs/heads/master c:
 37f6190d54f4d90b886784fadbb9cf82d5c8b1ef h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/mmc/host/omap_hsmmc.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f2c718210977..e684a941e6c9 100644
--- 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
index 98adf0c51e05..94d463859e9b 100644
--- 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);