summaryrefslogtreecommitdiff
path: root/drivers/mmc/host/sdhci.c
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2020-05-28 12:22:22 +0300
committerUlf Hansson <ulf.hansson@linaro.org>2020-05-28 12:22:22 +0300
commitb303c16cf3aa840c4abdda3b015313bfd83dad62 (patch)
treec5329d0a91d2d3085ee1ddf8dfaa9d85666eec3c /drivers/mmc/host/sdhci.c
parent91132078a38d9455b3832da1d68329e91b63ba25 (diff)
parent202500d21654874aa03243e91f96de153ec61860 (diff)
downloadlinux-b303c16cf3aa840c4abdda3b015313bfd83dad62.tar.xz
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
-rw-r--r--drivers/mmc/host/sdhci.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 52a492bd0ddd..37b1158c1c0c 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -4138,9 +4138,6 @@ 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))
@@ -4669,6 +4666,12 @@ int __sdhci_add_host(struct sdhci_host *host)
struct mmc_host *mmc = host->mmc;
int ret;
+ if ((mmc->caps2 & MMC_CAP2_CQE) &&
+ (host->quirks & SDHCI_QUIRK_BROKEN_CQE)) {
+ mmc->caps2 &= ~MMC_CAP2_CQE;
+ mmc->cqe_ops = NULL;
+ }
+
host->complete_wq = alloc_workqueue("sdhci", flags, 0);
if (!host->complete_wq)
return -ENOMEM;