diff options
| author | Xavier Boudet <x-boudet@ti.com> | 2012-07-26 09:41:20 +0200 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2012-09-10 14:50:22 +0200 |
| commit | 3097dec9f9e80dbfdbd405ee09508411bae10063 (patch) | |
| tree | ce3e8d78c908241630f73f27e36d5d1d76f03acc /drivers | |
| parent | de99127491e530b5604a6e5b2a1d1e7d3ea54ab2 (diff) | |
Revert "OMAP: HSMMC: Track regulator enabled locally"
This reverts commit a3df42492aa8c216e83ca9dd5f537c24de0089a8.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index cb95f2c747c4..6937ad56825d 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -287,13 +287,12 @@ static int omap_hsmmc_1_set_power(struct device *dev, int slot, int power_on, if (host->vcc_aux && !host->regulator_enabled && !ret) { ret = regulator_enable(host->vcc_aux); - if (!ret) { + if (!ret) host->regulator_enabled = 1; msleep(100); - } } } else { - if (host->vcc_aux && host->regulator_enabled) { + if (host->vcc_aux && regulator_is_enabled(host->vcc_aux) > 0) { ret = regulator_disable(host->vcc_aux); if (!ret) host->regulator_enabled = 0; |