From f4799a62e6e6794d749b888bd9b98755596ecf55 Mon Sep 17 00:00:00 2001 From: Aymen Zayet Date: Mon, 21 Nov 2011 19:24:42 +0100 Subject: [PATCH] sdhci: Do not power off the mmc card when entering in S3. BZ: 15061 Avoid enabling / disabling the regulator on suspend / resume. The attached card shall remain powered by the regulator. Change-Id: I5c848d911a27e9b0d19c5a37cf4ae60bcab77ccf Signed-off-by: Aymen Zayet Reviewed-on: http://android.intel.com:8080/25380 Reviewed-by: Champciaux, NicolasX Tested-by: Champciaux, NicolasX Reviewed-by: buildbot Tested-by: buildbot --- drivers/mmc/host/sdhci.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 4c67683..ae22f2c 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2600,9 +2600,6 @@ int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state) free_irq(host->irq, host); - if (host->vmmc) - ret = regulator_disable(host->vmmc); - out: sdhci_release_ownership(host->mmc); return ret; @@ -2616,12 +2613,6 @@ int sdhci_resume_host(struct sdhci_host *host) sdhci_acquire_ownership(host->mmc); - if (host->vmmc) { - int ret = regulator_enable(host->vmmc); - if (ret) - goto out; - } - if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) { if (host->ops->enable_dma) host->ops->enable_dma(host); -- 2.7.4