diff options
| author | Xavier Boudet <x-boudet@ti.com> | 2012-07-26 09:41:30 +0200 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2012-09-10 14:50:22 +0200 |
| commit | f0b6c051ed9b10fff9ba45ab6428c644cd16d315 (patch) | |
| tree | 2de7b5a32024f663233d7d25b1723d0a100aaf3f /drivers | |
| parent | 3097dec9f9e80dbfdbd405ee09508411bae10063 (diff) | |
OMAP HSMMC Force enable attempt so that we can call disable
This reverts commit 4cc9ecff8ed1912ea679dc71b03a32045d88946a.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 6937ad56825d..17eba70783e2 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -285,7 +285,7 @@ static int omap_hsmmc_1_set_power(struct device *dev, int slot, int power_on, 2900000, 2900000); } - if (host->vcc_aux && !host->regulator_enabled && !ret) { + if (host->vcc_aux && !host->regulator_enabled) { ret = regulator_enable(host->vcc_aux); if (!ret) host->regulator_enabled = 1; |