diff options
| author | Jassi Brar <jaswinder.singh@linaro.org> | 2012-07-16 17:44:34 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-07-19 17:04:10 +0800 |
| commit | b199d35e76bb81a491c3ac57cf8d529c953cdd48 (patch) | |
| tree | fd9b10b58a883fe1977cf625af11f8acbafa3d7c | |
| parent | 9042f6854aedce02207bc648a67b914debaf6997 (diff) | |
| download | panda-b199d35e76bb81a491c3ac57cf8d529c953cdd48.tar.gz | |
OMAP: HSMMC: Revert "OMAP HSMMC Force enable attempt so that we can call disable"
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
| -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 aaad72a726d..de6a643b068 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) { + if (host->vcc_aux && !host->regulator_enabled && !ret) { ret = regulator_enable(host->vcc_aux); if (!ret) host->regulator_enabled = 1; |