mmc: sdhci: Deal with failure case in sdhci_suspend_host
Aaron Lu [Wed, 4 Jan 2012 02:07:43 +0000 (10:07 +0800)]
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 <prakity@marvell.com>
Signed-off-by: Aaron Lu <aaron.lu@amd.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
(cherry picked from commit 38a60ea2e7b33ab33ee11d6ef527f259edb102cf)

Bug 984811

Change-Id: I532c3914cecf63291a23baa669c650b4ac5448e4
Signed-off-by: Sang-Hun Lee <sanlee@nvidia.com>
Reviewed-on: http://git-master/r/106351
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>

drivers/mmc/host/sdhci.c

index 4955869..2281466 100644 (file)
@@ -2330,20 +2330,34 @@ out:
 int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state)
 {
        int ret = 0;
+       bool has_tuning_timer;
        struct mmc_host *mmc = host->mmc;
 
        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) {
                host->flags &= ~SDHCI_NEEDS_RETUNING;
                mod_timer(&host->tuning_timer, jiffies +
                        host->tuning_count * HZ);
        }
 
-       if (mmc->card)
+       if (mmc->card) {
                ret = mmc_suspend_host(host->mmc);
+               if (ret) {
+                       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;
+               }
+       }
 
        if (mmc->pm_flags & MMC_PM_KEEP_POWER)
                host->card_int_set = sdhci_readl(host, SDHCI_INT_ENABLE) &