mmc: host: omap_hsmmc: avoid pbias regulator enable on power off

Fix omap_hsmmc_set_power so that pbias regulator is not enabled
during power off.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 810d612f58a0b73b04ed16c7d0c65189e75dc2a3..eec69752a189da603eaac893a6a798144a9e61b4 100644 (file)
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -388,16 +388,16 @@ static int omap_hsmmc_set_power(struct device *dev, int power_on, int vdd)
                ret = omap_hsmmc_enable_supply(mmc, vdd);
                if (ret)
                        return ret;
+
+               ret = omap_hsmmc_set_pbias(host, true, vdd);
+               if (ret)
+                       goto err_set_voltage;
        } else {
                ret = omap_hsmmc_disable_supply(mmc);
                if (ret)
                        return ret;
        }
 
-       ret = omap_hsmmc_set_pbias(host, true, vdd);
-       if (ret)
-               goto err_set_voltage;
-
        if (mmc_pdata(host)->after_set_reg)
                mmc_pdata(host)->after_set_reg(dev, power_on, vdd);