diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:09:58 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:09:58 +0000 |
| commit | 3965859d32cbe5e29c1f99b417feeb9e6d02f7d8 (patch) | |
| tree | c0759017a5c4c81744a74e232d8cd96442bbdffa | |
| parent | 3b661186115c28e351916cd212dfdf4b85d6a980 (diff) | |
fix-glamo-mci-dont-filter-voltage-change.patch
Signed-off-by: Andy Green <andy@openmoko.com>
| -rw-r--r-- | drivers/mfd/glamo/glamo-mci.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c index 0d829557439..7a2b060b3a7 100644 --- a/drivers/mfd/glamo/glamo-mci.c +++ b/drivers/mfd/glamo/glamo-mci.c @@ -690,17 +690,16 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) switch(ios->power_mode) { case MMC_POWER_ON: case MMC_POWER_UP: - if (host->power_mode_current != MMC_POWER_OFF) - break; if (host->vdd_current != ios->vdd) { host->pdata->glamo_set_mci_power(ios->power_mode, ios->vdd); host->vdd_current = ios->vdd; } - glamo_engine_enable(glamo_mci_def_pdata.pglamo, - GLAMO_ENGINE_MMC); - glamo_mci_reset(host); - powering = 1; + if (host->power_mode_current == MMC_POWER_OFF) { + glamo_engine_enable(glamo_mci_def_pdata.pglamo, + GLAMO_ENGINE_MMC); + powering = 1; + } break; case MMC_POWER_OFF: |