summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan QIAN <b32804@freescale.com>2011-12-31 14:12:18 +0800
committerJason Liu <r64343@freescale.com>2012-01-09 21:13:48 +0800
commit1e3d9a147600515d368f58407af49c4bed3a1535 (patch)
tree822eb5c430a92d80551785a1eddddcb67f448ec8
parentebc62bf1b7857c55cdda5e5e66008089d3ea5391 (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>
-rwxr-xr-xdrivers/mmc/host/sdhci.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 0cb6a8b14802..394ddcd0936c 100755
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2286,8 +2286,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);
@@ -2326,7 +2324,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);
@@ -2358,7 +2356,6 @@ out:
(host->tuning_mode == SDHCI_TUNING_MODE_1))
host->flags |= SDHCI_NEEDS_RETUNING;
- mmc_release_host(host->mmc);
return ret;
}