summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/mmci.c
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2014-12-11 14:35:55 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2015-01-19 09:56:23 +0100
commit6f2d3c89db7c2ef6ceb03feefa325f52ea639a41 (patch)
tree65e9cc0715aa6bebafecc50ffcdaa03b10724988 /drivers/mmc/host/mmci.c
parent106276bbc98bd0bac554edce0869d356596ff9ae (diff)
downloadlinux-6f2d3c89db7c2ef6ceb03feefa325f52ea639a41.tar.gz
linux-6f2d3c89db7c2ef6ceb03feefa325f52ea639a41.tar.bz2
linux-6f2d3c89db7c2ef6ceb03feefa325f52ea639a41.zip
mmc: mmci: Do pm_runtime_put() after the host has been added
Previously the pm_runtime_put() caused the device to be runtime PM suspended, but then immediately being resumed when we add the host. Prevent this unnecessary runtime PM suspend/resume cycle during ->probe() by moving the call to pm_runtime_put() after mmc_add_host(). Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/mmci.c')
-rw-r--r--drivers/mmc/host/mmci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 8232e9a02d40..88aefa6fa8b1 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1739,10 +1739,10 @@ static int mmci_probe(struct amba_device *dev,
pm_runtime_set_autosuspend_delay(&dev->dev, 50);
pm_runtime_use_autosuspend(&dev->dev);
- pm_runtime_put(&dev->dev);
mmc_add_host(mmc);
+ pm_runtime_put(&dev->dev);
return 0;
clk_disable: