aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host
diff options
context:
space:
mode:
authorJisheng Zhang <jszhang@marvell.com>2015-01-04 10:15:48 -0500
committerUlf Hansson <ulf.hansson@linaro.org>2015-01-19 03:56:32 -0500
commit20f1f2d7d4a497ce6c51866e23ce5f452e3aeb99 (patch)
tree1c846c0d9318c5536d29b5e073cfebe6793ce9cd /drivers/mmc/host
parent62cf983ad84275f8580c807e5e596216c46773cf (diff)
mmc: sdhci-pxav3: fix pm unbalanced issue in -> remove()
This patch calls pm_runtime_put_noidle() to restore the device's usage counter in the ->remove() implementation. Signed-off-by: Jisheng Zhang <jszhang@marvell.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host')
-rw-r--r--drivers/mmc/host/sdhci-pxav3.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index 1255dd2b91c1..4de39fb6dc2d 100644
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -412,8 +412,10 @@ static int sdhci_pxav3_remove(struct platform_device *pdev)
412 struct sdhci_pxa *pxa = pltfm_host->priv; 412 struct sdhci_pxa *pxa = pltfm_host->priv;
413 413
414 pm_runtime_get_sync(&pdev->dev); 414 pm_runtime_get_sync(&pdev->dev);
415 sdhci_remove_host(host, 1);
416 pm_runtime_disable(&pdev->dev); 415 pm_runtime_disable(&pdev->dev);
416 pm_runtime_put_noidle(&pdev->dev);
417
418 sdhci_remove_host(host, 1);
417 419
418 clk_disable_unprepare(pxa->clk_io); 420 clk_disable_unprepare(pxa->clk_io);
419 if (!IS_ERR(pxa->clk_core)) 421 if (!IS_ERR(pxa->clk_core))