Merge tag 'mmc-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

c925e0ea · Linus Torvalds <[email protected]> · 2017-10-20 06:52:05 -04:00

Pull MMC fix from Ulf Hansson:
 "sdhci-pci: Fix default d3_retune for Intel host controllers"

* tag 'mmc-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-pci: Fix default d3_retune for Intel host controllers

Commit: c925e0ea500d6bce337a26a649eba122f45aecb2
Parents: d92116a0 · eb701ce1

Merge commit. Changes below are compared with the first parent: d92116a0.

Changes

1 files changed · +2 −0

File	Status	Add	Del	Content
drivers/mmc/host/sdhci-pci-core.c	modified	+2	−0	View file

drivers/mmc/host/sdhci-pci-core.c

View file

diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index d0ccc67..67d787f 100644
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -448,6 +448,8 @@ static void intel_dsm_init(struct intel_host *intel_host, struct device *dev,
 	int err;
 	u32 val;
 
+	intel_host->d3_retune = true;
+
 	err = __intel_dsm(intel_host, dev, INTEL_DSM_FNS, &intel_host->dsm_fns);
 	if (err) {
 		pr_debug("%s: DSM not supported, error %d\n",