summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTeppei Kamijou <teppei.kamijou.yb@renesas.com>2012-12-12 15:38:06 +0100
committerChris Ball <cjb@laptop.org>2013-02-11 12:51:24 -0500
commitf8a8ced7f9e79916311c0ef08d1f6de7bf954807 (patch)
treef684a5c647dcf7b66e776f695ecd487d62511b4f /drivers
parent92ff0c5bc4000d6b2b1bfc8cd40bd1397a03c8ec (diff)
downloadlinux-f8a8ced7f9e79916311c0ef08d1f6de7bf954807.tar.gz
linux-f8a8ced7f9e79916311c0ef08d1f6de7bf954807.tar.bz2
linux-f8a8ced7f9e79916311c0ef08d1f6de7bf954807.zip
mmc: sh_mmcif: ensure run-time suspend call is processed before suspend
With this post-v2.6.35 change applied: commit a0a1a5fd4fb15ec61117c759fe9f5c16c53d9e9c Author: Tejun Heo <tj@kernel.org> Date: Tue Jun 29 10:07:12 2010 +0200 workqueue: reimplement workqueue freeze using max_active freeze_workqueues_begin() was introduced and workqueue now gets frozen before device drivers suspend operations. We have to ensure that run-time PM suspend operation completes before system-wide suspend is started. Signed-off-by: Teppei Kamijou <teppei.kamijou.yb@renesas.com> Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sh_mmcif.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 8b4e98e2b130..2ff3e4774b67 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -982,7 +982,7 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
}
}
if (host->power) {
- pm_runtime_put(&host->pd->dev);
+ pm_runtime_put_sync(&host->pd->dev);
clk_disable(host->hclk);
host->power = false;
if (ios->power_mode == MMC_POWER_OFF)