1 files changed, 13 insertions, 8 deletions

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 03c26e026506..8c863ccb1bfe 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -250,9 +250,9 @@ static int omap_hsmmc_1_set_power(struct device *dev, int slot, int power_on,
                 mmc_slot(host).before_set_reg(dev, slot, power_on, vdd);
 
         if (power_on)
-                ret = mmc_regulator_set_ocr(host->vcc, vdd);
+                ret = mmc_regulator_set_ocr(host->mmc, host->vcc, vdd);
         else
-                ret = mmc_regulator_set_ocr(host->vcc, 0);
+                ret = mmc_regulator_set_ocr(host->mmc, host->vcc, 0);
 
         if (mmc_slot(host).after_set_reg)
                 mmc_slot(host).after_set_reg(dev, slot, power_on, vdd);
@@ -291,18 +291,23 @@ static int omap_hsmmc_23_set_power(struct device *dev, int slot, int power_on,
          * chips/cards need an interface voltage rail too.
          */
         if (power_on) {
-                ret = mmc_regulator_set_ocr(host->vcc, vdd);
+                ret = mmc_regulator_set_ocr(host->mmc, host->vcc, vdd);
                 /* Enable interface voltage rail, if needed */
                 if (ret == 0 && host->vcc_aux) {
                         ret = regulator_enable(host->vcc_aux);
                         if (ret < 0)
-                                ret = mmc_regulator_set_ocr(host->vcc, 0);
+                                ret = mmc_regulator_set_ocr(host->mmc,
+                                                        host->vcc, 0);
                 }
         } else {
+                /* Shut down the rail */
                 if (host->vcc_aux)
                         ret = regulator_disable(host->vcc_aux);
-                if (ret == 0)
-                        ret = mmc_regulator_set_ocr(host->vcc, 0);
+                if (!ret) {
+                        /* Then proceed to shut down the local regulator */
+                        ret = mmc_regulator_set_ocr(host->mmc,
+                                                host->vcc, 0);
+                }
         }
 
         if (mmc_slot(host).after_set_reg)
@@ -343,9 +348,9 @@ static int omap_hsmmc_23_set_sleep(struct device *dev, int slot, int sleep,
         if (cardsleep) {
                 /* VCC can be turned off if card is asleep */
                 if (sleep)
-                        err = mmc_regulator_set_ocr(host->vcc, 0);
+                        err = mmc_regulator_set_ocr(host->mmc, host->vcc, 0);
                 else
-                        err = mmc_regulator_set_ocr(host->vcc, vdd);
+                        err = mmc_regulator_set_ocr(host->mmc, host->vcc, vdd);
         } else
                 err = regulator_set_mode(host->vcc, mode);
         if (err)