diff options
| author | Colin Cross <ccross@android.com> | 2011-11-03 22:05:31 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-11-03 22:05:31 -0700 |
| commit | 90672f17369273aba3fb402d5c41752686c65d53 (patch) | |
| tree | a7d23ad74772dd01384ca6cbe58ef406c7315aa1 /drivers/mmc | |
| parent | ba54fe4bd1753c72fec97ca2a96f0cae46b2748b (diff) | |
| parent | 63efe447c4a007ac27c7fe98e492d8ad03326c39 (diff) | |
| download | kernel_samsung_tuna-90672f17369273aba3fb402d5c41752686c65d53.zip kernel_samsung_tuna-90672f17369273aba3fb402d5c41752686c65d53.tar.gz kernel_samsung_tuna-90672f17369273aba3fb402d5c41752686c65d53.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
Conflicts:
drivers/mmc/host/omap_hsmmc.c
Change-Id: I37eac90b9007a8a96fa25788126e2bf2b49255aa
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index b7ed408..c89c45c 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -2347,8 +2347,7 @@ static int omap_hsmmc_suspend(struct device *dev) cancel_work_sync(&host->mmc_carddetect_work); if (mmc_slot(host).mmc_data.built_in) host->mmc->pm_flags |= MMC_PM_KEEP_POWER; - if (host->mmc->card && (host->mmc->card->type != MMC_TYPE_SDIO)) - ret = mmc_suspend_host(host->mmc); + ret = mmc_suspend_host(host->mmc); mmc_host_enable(host->mmc); if (ret == 0) { omap_hsmmc_disable_irq(host); @@ -2410,8 +2409,7 @@ static int omap_hsmmc_resume(struct device *dev) omap_hsmmc_protect_card(host); /* Notify the core to resume the host */ - if (host->mmc->card && (host->mmc->card->type != MMC_TYPE_SDIO)) - ret = mmc_resume_host(host->mmc); + ret = mmc_resume_host(host->mmc); if (ret == 0) host->suspended = 0; |