summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@stericsson.com>2011-10-26 13:24:48 +0200
committerLinus WALLEIJ <linus.walleij@stericsson.com>2011-10-27 16:36:05 +0200
commit6b30c0d1726a3951e31a2be800d805ced5e228bd (patch)
treef011e35e6dcb91e2e704d04de3139a23d8392ea0
parentf3e44d9f258f8d298cb177ea2ace0bf3ed002a74 (diff)
mmc: mmci: PM runtime update
In the suspend callback the pm_runtime_put_sync is now no more useable. To be able to force our device into runtime suspend state while doing a system suspend, the AMBA bus are using the suspend|resume_noirq functions. The AMBA bus will from these functions call for it's runtime_suspend|resume functions which then reaches mmci's runtime_suspend|resume as well. Change-Id: I86d7480fd8612d80e2f5e0e8d9d3b31f42637638 Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35506 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
-rw-r--r--drivers/mmc/host/mmci.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 3ce37a4cc99..f235aa45a3e 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1548,13 +1548,9 @@ static int mmci_suspend(struct device *dev)
if (mmc) {
struct mmci_host *host = mmc_priv(mmc);
- pm_runtime_get_sync(mmc->parent);
-
ret = mmc_suspend_host(mmc);
if (!ret)
mmci_disable_irq(host);
-
- pm_runtime_put_sync_suspend(mmc->parent);
}
return ret;