1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 781e4db31767..7fb0753abe30 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -182,6 +182,7 @@ struct omap_hsmmc_host {
         struct  clk             *fclk;
         struct  clk             *dbclk;
         struct  regulator       *pbias;
+        bool                    pbias_enabled;
         void    __iomem         *base;
         int                     vqmmc_enabled;
         resource_size_t         mapbase;
@@ -328,20 +329,22 @@ static int omap_hsmmc_set_pbias(struct omap_hsmmc_host *host, bool power_on,
                         return ret;
                 }
 
-                if (!regulator_is_enabled(host->pbias)) {
+                if (host->pbias_enabled == 0) {
                         ret = regulator_enable(host->pbias);
                         if (ret) {
                                 dev_err(host->dev, "pbias reg enable fail\n");
                                 return ret;
                         }
+                        host->pbias_enabled = 1;
                 }
         } else {
-                if (regulator_is_enabled(host->pbias)) {
+                if (host->pbias_enabled == 1) {
                         ret = regulator_disable(host->pbias);
                         if (ret) {
                                 dev_err(host->dev, "pbias reg disable fail\n");
                                 return ret;
                         }
+                        host->pbias_enabled = 0;
                 }
         }
 
@@ -475,7 +478,7 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
         mmc->supply.vmmc = devm_regulator_get_optional(host->dev, "vmmc");
         if (IS_ERR(mmc->supply.vmmc)) {
                 ret = PTR_ERR(mmc->supply.vmmc);
-                if (ret != -ENODEV)
+                if ((ret != -ENODEV) && host->dev->of_node)
                         return ret;
                 dev_dbg(host->dev, "unable to get vmmc regulator %ld\n",
                         PTR_ERR(mmc->supply.vmmc));
@@ -490,7 +493,7 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
         mmc->supply.vqmmc = devm_regulator_get_optional(host->dev, "vmmc_aux");
         if (IS_ERR(mmc->supply.vqmmc)) {
                 ret = PTR_ERR(mmc->supply.vqmmc);
-                if (ret != -ENODEV)
+                if ((ret != -ENODEV) && host->dev->of_node)
                         return ret;
                 dev_dbg(host->dev, "unable to get vmmc_aux regulator %ld\n",
                         PTR_ERR(mmc->supply.vqmmc));
@@ -500,7 +503,7 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
         host->pbias = devm_regulator_get_optional(host->dev, "pbias");
         if (IS_ERR(host->pbias)) {
                 ret = PTR_ERR(host->pbias);
-                if (ret != -ENODEV)
+                if ((ret != -ENODEV) && host->dev->of_node)
                         return ret;
                 dev_dbg(host->dev, "unable to get pbias regulator %ld\n",
                         PTR_ERR(host->pbias));
@@ -2053,6 +2056,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
         host->base      = base + pdata->reg_offset;
         host->power_mode = MMC_POWER_OFF;
         host->next_data.cookie = 1;
+        host->pbias_enabled = 0;
         host->vqmmc_enabled = 0;
 
         ret = omap_hsmmc_gpio_init(mmc, host, pdata);