diff options
author | Andrew Gabbasov <andrew_gabbasov@mentor.com> | 2014-10-01 08:14:07 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-11-10 06:40:26 -0500 |
commit | fbfaf0326b725cfbcc4169294cffefcad5ce64aa (patch) | |
tree | 04f2476584eb57d5730bc44b860dbbb04e9a1049 | |
parent | cd529af7eefae90b97fa90a24f1ad8ccef6ae41a (diff) |
mmc: sdhci: Balance vmmc regulator_disable()
As a follow-up of commit
"mmc: sdhci: Balance vmmc regulator_enable(), and always enable vqmmc"
vmmc regulator disable is also not needed in sdhci_remove_host.
The regulator is completely controlled by mmc_power_up and mmc_power_off
functions and is already disabled by the time of removing the host.
Extra regulator_disable call in sdhci_remove_host is unbalanced and
causes a warning reported by regulator core, so should be removed.
Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r-- | drivers/mmc/host/sdhci.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index ada1a3ea3a87..179ce06eec73 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c | |||
@@ -3339,9 +3339,6 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) | |||
3339 | 3339 | ||
3340 | tasklet_kill(&host->finish_tasklet); | 3340 | tasklet_kill(&host->finish_tasklet); |
3341 | 3341 | ||
3342 | if (!IS_ERR(mmc->supply.vmmc)) | ||
3343 | regulator_disable(mmc->supply.vmmc); | ||
3344 | |||
3345 | if (!IS_ERR(mmc->supply.vqmmc)) | 3342 | if (!IS_ERR(mmc->supply.vqmmc)) |
3346 | regulator_disable(mmc->supply.vqmmc); | 3343 | regulator_disable(mmc->supply.vqmmc); |
3347 | 3344 | ||