diff options
| author | Ryan QIAN <b32804@freescale.com> | 2011-12-31 14:12:18 +0800 |
|---|---|---|
| committer | Ryan QIAN <b32804@freescale.com> | 2011-12-31 14:40:17 +0800 |
| commit | f66116495613d2aa0e7a7ce80d7bc092c7ecc263 (patch) | |
| tree | 93aa3e032eeb744fa8f7a6c524d61c204d2b7d01 | |
| parent | 8acdad0baf758115ab4f4e14982198dedcb61510 (diff) | |
ENGR00171083 Revert "ENGR00170944 [MX6Q MMC]suspend/resume crash"
issue:
in the reverted patch, sdhc driver will claim host on its
entering suspend state. and the wifi driver will hold host on
its loading. so once system is about to enter suspend state,
system will be pended on claiming host.
fix:
- Revert "ENGR00170944 [MX6Q MMC]suspend/resume crash"
This reverts commit 3b2e3729dc57a5ff532552cde49de7ace4c5792c.
Signed-off-by: Ryan QIAN <b32804@freescale.com>
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index ee183c57a08..147442753b1 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1720,8 +1720,6 @@ int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state) { int ret; - mmc_claim_host(host->mmc); - sdhci_enable_clk(host); sdhci_disable_card_detection(host); @@ -1752,7 +1750,7 @@ int sdhci_resume_host(struct sdhci_host *host) if (host->vmmc) { ret = regulator_enable(host->vmmc); if (ret) - goto out; + return ret; } sdhci_enable_clk(host); @@ -1779,7 +1777,6 @@ out: /* sync worker */ sdhci_disable_clk(host, 0); - mmc_release_host(host->mmc); return ret; } |