aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-10-20 06:52:05 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-10-20 06:52:05 -0400
commitc925e0ea500d6bce337a26a649eba122f45aecb2 (patch)
treec70ff4aad3916703815e9580e279ac08d1db56c5
parentd92116a089eba1eed02ab8cf8bf6d16a260bb7dc (diff)
parenteb701ce16a45ed9880897c48f05ee608d77c72e3 (diff)
downloadlinux-c925e0ea500d6bce337a26a649eba122f45aecb2.tar.gz
Merge tag 'mmc-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
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
-rw-r--r--drivers/mmc/host/sdhci-pci-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index d0ccc6729fd2..67d787fa3306 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",