Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[mirror_ubuntu-artful-kernel.git] / drivers / mmc / host / sdhci-pci-core.c

diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index 79e19017343edb0eeffc1e8ac1ddcbe165994bc3..97d4eebd6bf59edbeb88f7efa5e6fec8bbab6aeb 100644 (file)
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -340,8 +340,6 @@ static int bxt_get_cd(struct mmc_host *mmc)
        if (!gpio_cd)
                return 0;
 
-       pm_runtime_get_sync(mmc->parent);
-
        spin_lock_irqsave(&host->lock, flags);
 
        if (host->flags & SDHCI_DEVICE_DEAD)
@@ -351,9 +349,6 @@ static int bxt_get_cd(struct mmc_host *mmc)
 out:
        spin_unlock_irqrestore(&host->lock, flags);
 
-       pm_runtime_mark_last_busy(mmc->parent);
-       pm_runtime_put_autosuspend(mmc->parent);
-
        return ret;
 }
 
@@ -391,8 +386,10 @@ static int byt_sd_probe_slot(struct sdhci_pci_slot *slot)
        slot->cd_override_level = true;
        if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXT_SD ||
            slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXTM_SD ||
-           slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_APL_SD)
+           slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_APL_SD) {
                slot->host->mmc_host_ops.get_cd = bxt_get_cd;
+               slot->host->mmc->caps |= MMC_CAP_AGGRESSIVE_PM;
+       }
 
        return 0;
 }