summaryrefslogtreecommitdiff
path: root/drivers/mmc/host/sdhci.c
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2019-12-18 16:44:24 +0300
committerUlf Hansson <ulf.hansson@linaro.org>2019-12-18 16:44:24 +0300
commitd0b75c9169fd818979d7122eaff9c3ff20128b7a (patch)
tree13c362d1c06017157a62455a1a8fd1322d3e0f41 /drivers/mmc/host/sdhci.c
parent66a83feb59d960cb4df99c54266f07dc92bf60d0 (diff)
parent75d27ea1abf7af3cc2cdec3513e74f52191605c8 (diff)
downloadlinux-d0b75c9169fd818979d7122eaff9c3ff20128b7a.tar.xz
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
-rw-r--r--drivers/mmc/host/sdhci.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index c04e1ac434f0..275102c0a1bf 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -3756,6 +3756,9 @@ int sdhci_setup_host(struct sdhci_host *host)
mmc_hostname(mmc), host->version);
}
+ if (host->quirks & SDHCI_QUIRK_BROKEN_CQE)
+ mmc->caps2 &= ~MMC_CAP2_CQE;
+
if (host->quirks & SDHCI_QUIRK_FORCE_DMA)
host->flags |= SDHCI_USE_SDMA;
else if (!(host->caps & SDHCI_CAN_DO_SDMA))