diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2019-09-13 13:57:37 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2019-09-13 13:57:37 +0200 |
| commit | b46119796721301e410a357b91195eed46980ea6 (patch) | |
| tree | 8741d0444e7cac429b68d5bc658938ebfe4987a3 /drivers/mmc/host/uniphier-sd.c | |
| parent | ms_block: fix spelling mistake "randomally" -> "randomly" (diff) | |
| parent | mmc: tmio: Fixup runtime PM management during remove (diff) | |
| download | linux-b46119796721301e410a357b91195eed46980ea6.tar.xz linux-b46119796721301e410a357b91195eed46980ea6.zip | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc/host/uniphier-sd.c')
| -rw-r--r-- | drivers/mmc/host/uniphier-sd.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c index e09336f9166d..0c72ec5546c3 100644 --- a/drivers/mmc/host/uniphier-sd.c +++ b/drivers/mmc/host/uniphier-sd.c @@ -629,7 +629,6 @@ static int uniphier_sd_probe(struct platform_device *pdev) host->clk_disable = uniphier_sd_clk_disable; host->set_clock = uniphier_sd_set_clock; - pm_runtime_enable(&pdev->dev); ret = uniphier_sd_clk_enable(host); if (ret) goto free_host; @@ -651,7 +650,6 @@ static int uniphier_sd_probe(struct platform_device *pdev) free_host: tmio_mmc_host_free(host); - pm_runtime_disable(&pdev->dev); return ret; } @@ -662,7 +660,6 @@ static int uniphier_sd_remove(struct platform_device *pdev) tmio_mmc_host_remove(host); uniphier_sd_clk_disable(host); - pm_runtime_disable(&pdev->dev); return 0; } |