mmc: host: omap_hsmmc: use the ocrmask provided by the vmmc regulator

[deliverable/linux.git] / drivers / mmc / host / omap_hsmmc.c

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 3fde2f9dfb25e9466eb7ecea5b60f09749e06145..30f363da1987c3924c46a731233fde1b449df327 100644 (file)
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -359,16 +359,8 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
                host->vcc = NULL;
        } else {
                ocr_value = mmc_regulator_get_ocrmask(host->vcc);
-               if (!mmc_pdata(host)->ocr_mask) {
+               if (ocr_value > 0)
                        mmc_pdata(host)->ocr_mask = ocr_value;
-               } else {
-                       if (!(mmc_pdata(host)->ocr_mask & ocr_value)) {
-                               dev_err(host->dev, "ocrmask %x is not supported\n",
-                                       mmc_pdata(host)->ocr_mask);
-                               mmc_pdata(host)->ocr_mask = 0;
-                               return -EINVAL;
-                       }
-               }
        }
 
        /* Allow an aux regulator */