Don't access vqmmc regulator handler, if it's already invalidated.
Fixes: f870b6d480d3 (mmc: sdhci: Allow platform controlled voltage switching)
Reported-by: Dan Carpenter <dan.carpen...@oracle.com>
Signed-off-by: Veerabhadrarao Badiganti <vbadi...@codeaurora.org>
---
drivers/mmc/host/sdhci.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index e6275c2202b0..d3b62fc5c661 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -4383,11 +4383,6 @@ int sdhci_setup_host(struct sdhci_host *host)
if (!IS_ERR(mmc->supply.vqmmc)) {
if (enable_vqmmc) {
ret = regulator_enable(mmc->supply.vqmmc);
- if (ret) {
- pr_warn("%s: Failed to enable vqmmc regulator:
%d\n",
- mmc_hostname(mmc), ret);
- mmc->supply.vqmmc = ERR_PTR(-EINVAL);
- }
host->sdhci_core_to_disable_vqmmc = !ret;
}
@@ -4402,6 +4397,13 @@ int sdhci_setup_host(struct sdhci_host *host)
if (!regulator_is_supported_voltage(mmc->supply.vqmmc, 2700000,
3600000))
host->flags &= ~SDHCI_SIGNALING_330;
+
+ if (ret) {
+ pr_warn("%s: Failed to enable vqmmc regulator: %d\n",
+ mmc_hostname(mmc), ret);
+ mmc->supply.vqmmc = ERR_PTR(-EINVAL);
+ }
+
}
if (host->quirks2 & SDHCI_QUIRK2_NO_1_8_V) {
--
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.,
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
