mmc: dw_mmc: Keep vqmmc-supply enable count in balance

With the commit 4fcba5d556b4 ("regulator: implement basic reference
counter"), keeping regulator enablement in balance become more important.

Disable vqmmc-supply before signal voltage is changed to keep regulator
enable counter in balance.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>

diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index 5085a3b491dac771fc931d171119626a20112a46..400066fa99a29b5cc41cd5818b89a386c27823d9 100644 (file)
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -509,6 +509,10 @@ static int dwmci_set_ios(struct mmc *mmc)
        if (mmc->vqmmc_supply) {
                int ret;
 
+               ret = regulator_set_enable_if_allowed(mmc->vqmmc_supply, false);
+               if (ret)
+                       return ret;
+
                if (mmc->signal_voltage == MMC_SIGNAL_VOLTAGE_180)
                        regulator_set_value(mmc->vqmmc_supply, 1800000);
                else