From 1e82ac3bd00433d85adfe21d1ad3d6487630d00f Mon Sep 17 00:00:00 2001 From: Teppei Kamijou Date: Wed, 12 Dec 2012 15:38:06 +0100 Subject: [PATCH] --- yaml --- r: 359874 b: refs/heads/master c: 85033ef29f5ca3c362dcf79356c9ba8759b6d8ac h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sh_mmcif.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8e2f7b497699..ca96b29693d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd0511503532320e68396c90617d5f91ed7cae1c +refs/heads/master: 85033ef29f5ca3c362dcf79356c9ba8759b6d8ac diff --git a/trunk/drivers/mmc/host/sh_mmcif.c b/trunk/drivers/mmc/host/sh_mmcif.c index 8b4e98e2b130..2ff3e4774b67 100644 --- a/trunk/drivers/mmc/host/sh_mmcif.c +++ b/trunk/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)