mmc: sdhci: Balance vmmc regulator_disable()
authorAndrew Gabbasov <andrew_gabbasov@mentor.com>
Wed, 1 Oct 2014 12:14:07 +0000 (07:14 -0500)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 10 Nov 2014 11:40:26 +0000 (12:40 +0100)
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>
drivers/mmc/host/sdhci.c

index ada1a3ea3a87122b7b6ca52c7397e338bc81128f..179ce06eec732eaec918228d7309da5c68c726bd 100644 (file)
@@ -3339,9 +3339,6 @@ void sdhci_remove_host(struct sdhci_host *host, int dead)
 
        tasklet_kill(&host->finish_tasklet);
 
-       if (!IS_ERR(mmc->supply.vmmc))
-               regulator_disable(mmc->supply.vmmc);
-
        if (!IS_ERR(mmc->supply.vqmmc))
                regulator_disable(mmc->supply.vqmmc);