diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-01-25 17:48:37 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-01-26 13:47:01 -0800 |
| commit | f788e378015396fc1cfbf0681ddcdb48031e0b6d (patch) | |
| tree | 0efd35250f49bfeae5b33c8baa8901cf34e908b0 /drivers/mmc | |
| parent | c885fad9bb18f3649d5eef1d3ba2a659946bf196 (diff) | |
| download | kernel_samsung_tuna-f788e378015396fc1cfbf0681ddcdb48031e0b6d.zip kernel_samsung_tuna-f788e378015396fc1cfbf0681ddcdb48031e0b6d.tar.gz kernel_samsung_tuna-f788e378015396fc1cfbf0681ddcdb48031e0b6d.tar.bz2 | |
mmc: omap_hsmmc: Prevent calling mmc_host_lazy_disable() on suspend path
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index cd67c55..046448d 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1516,7 +1516,7 @@ static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) u32 con; int do_send_init_stream = 0; - mmc_host_enable(host->mmc); + pm_runtime_get_sync(host->dev); if (ios->power_mode != host->power_mode) { switch (ios->power_mode) { @@ -1611,10 +1611,7 @@ static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) else OMAP_HSMMC_WRITE(host->base, CON, con & ~OD); - if (host->power_mode == MMC_POWER_OFF) - mmc_host_disable(host->mmc); - else - mmc_host_lazy_disable(host->mmc); + pm_runtime_put_sync(host->dev); } static int omap_hsmmc_get_cd(struct mmc_host *mmc) |