diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-07-01 13:51:11 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2011-07-01 13:51:11 -0700 |
| commit | 85255805d902a9f447ffd5d715deefb668152981 (patch) | |
| tree | 0472e03864412d0cce6ad296b9eb19833655ff25 /drivers/mmc | |
| parent | cd756317468a864829b17a0a051d98e707c5be7a (diff) | |
| download | kernel_samsung_tuna-85255805d902a9f447ffd5d715deefb668152981.zip kernel_samsung_tuna-85255805d902a9f447ffd5d715deefb668152981.tar.gz kernel_samsung_tuna-85255805d902a9f447ffd5d715deefb668152981.tar.bz2 | |
mmc: omap_hsmmc: Skip mmc suspend/resume ops for SDIO device
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index aba1f71..641ce79 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -2361,7 +2361,8 @@ static int omap_hsmmc_suspend(struct device *dev) } } cancel_work_sync(&host->mmc_carddetect_work); - ret = mmc_suspend_host(host->mmc); + if (host->mmc->card && (host->mmc->card->type != MMC_TYPE_SDIO)) + ret = mmc_suspend_host(host->mmc); mmc_host_enable(host->mmc); if (ret == 0) { omap_hsmmc_disable_irq(host); @@ -2422,7 +2423,8 @@ static int omap_hsmmc_resume(struct device *dev) omap_hsmmc_protect_card(host); /* Notify the core to resume the host */ - ret = mmc_resume_host(host->mmc); + if (host->mmc->card && (host->mmc->card->type != MMC_TYPE_SDIO)) + ret = mmc_resume_host(host->mmc); if (ret == 0) host->suspended = 0; |