From mboxrd@z Thu Jan 1 00:00:00 1970 From: Aaron Lu Subject: [PATCH v2 2/2] mmc: sdhci: Deal with failure case in sdhci_suspend_host Date: Thu, 29 Dec 2011 10:50:14 +0800 Message-ID: <1325127014-16337-1-git-send-email-aaron.lu@amd.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from tx2ehsobe004.messaging.microsoft.com ([65.55.88.14]:59783 "EHLO TX2EHSOBE007.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751197Ab1L2CvP (ORCPT ); Wed, 28 Dec 2011 21:51:15 -0500 Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Chris Ball Cc: linux-mmc@vger.kernel.org, Aaron Lu , Philip Rakity , Adrian Hunter V2: Error processing code in sdhci_pci_suspend should not be deleted, it is used to resume hosts which are already successfully suspended for a multi slot pci device as suggested by Adrian. If there are errors happened in sdhci_suspend_host, handle it so that when the function returns with an error, the host's behaviour is the same before this function call, e.g. card detection is enabled and tuning timer is active, etc. Signed-off-by: Philip Rakity Signed-off-by: Aaron Lu Cc: Adrian Hunter --- drivers/mmc/host/sdhci.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 2007d37..37aeb81 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2339,25 +2339,40 @@ out: int sdhci_suspend_host(struct sdhci_host *host) { - int ret; + int ret, has_tuning_timer; sdhci_disable_card_detection(host); /* Disable tuning since we are suspending */ - if (host->version >= SDHCI_SPEC_300 && host->tuning_count && - host->tuning_mode == SDHCI_TUNING_MODE_1) { + has_tuning_timer = host->version >= SDHCI_SPEC_300 && + host->tuning_count && host->tuning_mode == SDHCI_TUNING_MODE_1; + if (has_tuning_timer) { del_timer_sync(&host->tuning_timer); host->flags &= ~SDHCI_NEEDS_RETUNING; } ret = mmc_suspend_host(host->mmc); if (ret) - return ret; + goto err_suspend; + + if (host->vmmc) { + ret = regulator_disable(host->vmmc); + if (ret) + goto err_suspend; + } free_irq(host->irq, host); - if (host->vmmc) - ret = regulator_disable(host->vmmc); + return 0; + +err_suspend: + if (has_tuning_timer) { + host->flags |= SDHCI_NEEDS_RETUNING; + mod_timer(&host->tuning_timer, jiffies + + host->tuning_count * HZ); + } + + sdhci_enable_card_detection(host); return ret; } -- 1.7.7.4