Merge branch 'omap-fixes'

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / mmc-twl4030.c

diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
index 2ff50f05f4917bb61d7c80d0ea6494a8e60eaf5a..46d6e9bcadfa5c495a9c9ab026b0a260bf922cb1 100644 (file)
--- a/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/arch/arm/mach-omap2/mmc-twl4030.c
@@ -136,14 +136,11 @@ static int twl_mmc_late_init(struct device *dev)
                         * (which is safe for MMC, but not in general).
                         */
                        if (regulator_is_enabled(hsmmc[i].vcc) > 0) {
-                               dev_warn(dev, "APPLY REGULATOR HACK for vmmc\n");
                                regulator_enable(hsmmc[i].vcc);
                                regulator_disable(hsmmc[i].vcc);
                        }
                        if (hsmmc[i].vcc_aux) {
                                if (regulator_is_enabled(reg) > 0) {
-                                       dev_warn(dev, "APPLY REGULATOR HACK "
-                                               "for vmmc_aux\n");
                                        regulator_enable(reg);
                                        regulator_disable(reg);
                                }
@@ -305,7 +302,7 @@ static int twl_mmc23_set_power(struct device *dev, int slot, int power_on, int v
                                ret = mmc_regulator_set_ocr(c->vcc, 0);
                }
        } else {
-               if (c->vcc_aux)
+               if (c->vcc_aux && (ret = regulator_is_enabled(c->vcc_aux)) > 0)
                        ret = regulator_disable(c->vcc_aux);
                if (ret == 0)
                        ret = mmc_regulator_set_ocr(c->vcc, 0);