1 files changed, 19 insertions, 12 deletions

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index f2e02d7d9f3d..87b4fc6c98c2 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -523,19 +523,27 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
         struct mmci_host *host = mmc_priv(mmc);
         u32 pwr = 0;
         unsigned long flags;
+        int ret;
 
         switch (ios->power_mode) {
         case MMC_POWER_OFF:
-                if(host->vcc &&
-                   regulator_is_enabled(host->vcc))
-                        regulator_disable(host->vcc);
+                if (host->vcc)
+                        ret = mmc_regulator_set_ocr(mmc, host->vcc, 0);
                 break;
         case MMC_POWER_UP:
-#ifdef CONFIG_REGULATOR
-                if (host->vcc)
-                        /* This implicitly enables the regulator */
-                        mmc_regulator_set_ocr(host->vcc, ios->vdd);
-#endif
+                if (host->vcc) {
+                        ret = mmc_regulator_set_ocr(mmc, host->vcc, ios->vdd);
+                        if (ret) {
+                                dev_err(mmc_dev(mmc), "unable to set OCR\n");
+                                /*
+                                 * The .set_ios() function in the mmc_host_ops
+                                 * struct return void, and failing to set the
+                                 * power should be rare so we print an error
+                                 * and return here.
+                                 */
+                                return;
+                        }
+                }
                 if (host->plat->vdd_handler)
                         pwr |= host->plat->vdd_handler(mmc_dev(mmc), ios->vdd,
                                                        ios->power_mode);
@@ -734,8 +742,7 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
         /*
          * We can do SGIO
          */
-        mmc->max_hw_segs = 16;
-        mmc->max_phys_segs = NR_SG;
+        mmc->max_segs = NR_SG;
 
         /*
          * Since only a certain number of bits are valid in the data length
@@ -870,8 +877,8 @@ static int __devexit mmci_remove(struct amba_device *dev)
                 clk_disable(host->clk);
                 clk_put(host->clk);
 
-                if (regulator_is_enabled(host->vcc))
-                        regulator_disable(host->vcc);
+                if (host->vcc)
+                        mmc_regulator_set_ocr(mmc, host->vcc, 0);
                 regulator_put(host->vcc);
 
                 mmc_free_host(mmc);