aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index ee524b06db14..c23a87285a95 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2649,7 +2649,6 @@ static void sdhci_runtime_pm_bus_off(struct sdhci_host *host)
2649int sdhci_runtime_suspend_host(struct sdhci_host *host) 2649int sdhci_runtime_suspend_host(struct sdhci_host *host)
2650{ 2650{
2651 unsigned long flags; 2651 unsigned long flags;
2652 int ret = 0;
2653 2652
2654 /* Disable tuning since we are suspending */ 2653 /* Disable tuning since we are suspending */
2655 if (host->flags & SDHCI_USING_RETUNING_TIMER) { 2654 if (host->flags & SDHCI_USING_RETUNING_TIMER) {
@@ -2669,14 +2668,14 @@ int sdhci_runtime_suspend_host(struct sdhci_host *host)
2669 host->runtime_suspended = true; 2668 host->runtime_suspended = true;
2670 spin_unlock_irqrestore(&host->lock, flags); 2669 spin_unlock_irqrestore(&host->lock, flags);
2671 2670
2672 return ret; 2671 return 0;
2673} 2672}
2674EXPORT_SYMBOL_GPL(sdhci_runtime_suspend_host); 2673EXPORT_SYMBOL_GPL(sdhci_runtime_suspend_host);
2675 2674
2676int sdhci_runtime_resume_host(struct sdhci_host *host) 2675int sdhci_runtime_resume_host(struct sdhci_host *host)
2677{ 2676{
2678 unsigned long flags; 2677 unsigned long flags;
2679 int ret = 0, host_flags = host->flags; 2678 int host_flags = host->flags;
2680 2679
2681 if (host_flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) { 2680 if (host_flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) {
2682 if (host->ops->enable_dma) 2681 if (host->ops->enable_dma)
@@ -2715,7 +2714,7 @@ int sdhci_runtime_resume_host(struct sdhci_host *host)
2715 2714
2716 spin_unlock_irqrestore(&host->lock, flags); 2715 spin_unlock_irqrestore(&host->lock, flags);
2717 2716
2718 return ret; 2717 return 0;
2719} 2718}
2720EXPORT_SYMBOL_GPL(sdhci_runtime_resume_host); 2719EXPORT_SYMBOL_GPL(sdhci_runtime_resume_host);
2721 2720