Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[karo-tx-linux.git] / drivers / mmc / host / sdhci-of-at91.c

diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
index d5430ed02a67896616bd1371a22f51bb59be8ee2..7611fd679f1ad83d7dee4052aebb6e9f6d3168cf 100644 (file)
--- a/drivers/mmc/host/sdhci-of-at91.c
+++ b/drivers/mmc/host/sdhci-of-at91.c
@@ -98,9 +98,7 @@ static void sdhci_at91_set_power(struct sdhci_host *host, unsigned char mode,
        if (!IS_ERR(host->mmc->supply.vmmc)) {
                struct mmc_host *mmc = host->mmc;
 
-               spin_unlock_irq(&host->lock);
                mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
-               spin_lock_irq(&host->lock);
        }
        sdhci_set_power_noreg(host, mode, vdd);
 }
@@ -140,6 +138,9 @@ static int sdhci_at91_runtime_suspend(struct device *dev)
 
        ret = sdhci_runtime_suspend_host(host);
 
+       if (host->tuning_mode != SDHCI_TUNING_MODE_3)
+               mmc_retune_needed(host->mmc);
+
        clk_disable_unprepare(priv->gck);
        clk_disable_unprepare(priv->hclock);
        clk_disable_unprepare(priv->mainck);