From: Andrew Gabbasov Date: Wed, 1 Oct 2014 12:14:07 +0000 (-0500) Subject: mmc: sdhci: Balance vmmc regulator_disable() X-Git-Tag: firefly_0821_release~176^2~2782^2~120 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fbfaf0326b725cfbcc4169294cffefcad5ce64aa;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Ulf Hansson --- 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) 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);