diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-02-27 11:17:04 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-02-27 11:17:04 -0800 |
| commit | eb46023aeeaa14f5cd1d04919eed564a8637b831 (patch) | |
| tree | 7ca2ca7469f3aab2c0dfbb7496e8c1f45ff56f7e /drivers/mmc | |
| parent | 59420ba7258c4dd1b67543ded34c91e95e73fedb (diff) | |
| download | kernel_samsung_crespo-eb46023aeeaa14f5cd1d04919eed564a8637b831.zip kernel_samsung_crespo-eb46023aeeaa14f5cd1d04919eed564a8637b831.tar.gz kernel_samsung_crespo-eb46023aeeaa14f5cd1d04919eed564a8637b831.tar.bz2 | |
mmc: sdhci: Allow mmc_suspend_host/mmc_resume_host for sdio devices
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/mmc')
| -rwxr-xr-x | drivers/mmc/host/sdhci.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 7baca39..46042f7 100755 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2317,7 +2317,6 @@ out: int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state) { int ret = 0; - struct mmc_host *mmc = host->mmc; sdhci_disable_card_detection(host); @@ -2329,8 +2328,7 @@ int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state) host->tuning_count * HZ); } - if (mmc->card && (mmc->card->type != MMC_TYPE_SDIO)) - ret = mmc_suspend_host(host->mmc); + ret = mmc_suspend_host(host->mmc); sdhci_mask_irqs(host, SDHCI_INT_ALL_MASK); @@ -2350,7 +2348,6 @@ EXPORT_SYMBOL_GPL(sdhci_suspend_host); int sdhci_resume_host(struct sdhci_host *host) { int ret = 0; - struct mmc_host *mmc = host->mmc; if (host->vmmc) { int ret = regulator_enable(host->vmmc); @@ -2370,8 +2367,7 @@ int sdhci_resume_host(struct sdhci_host *host) sdhci_init(host, (host->mmc->pm_flags & MMC_PM_KEEP_POWER)); mmiowb(); - if (mmc->card && (mmc->card->type != MMC_TYPE_SDIO)) - ret = mmc_resume_host(host->mmc); + ret = mmc_resume_host(host->mmc); sdhci_enable_card_detection(host); |