From 1b06a2b65ec023c921b3b8d9f3f96dcb743c7cc7 Mon Sep 17 00:00:00 2001
From: Balaji T K <balajitk@ti.com>
Date: Fri, 24 Feb 2012 21:14:33 +0530
Subject: [PATCH] --- yaml --- r: 298806 b: refs/heads/master c:
 d59d77ed1e0cdd254f99260013b27d64dc1dffac h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1e65891b0dc9..4b9f18db7918 100644
--- 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
index 47adb161d3ad..f15b04b9da27 100644
--- 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) {