summaryrefslogtreecommitdiff
path: root/drivers/mmc/host/cqhci-core.c
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2021-10-26 18:37:06 +0300
committerUlf Hansson <ulf.hansson@linaro.org>2021-10-26 18:37:06 +0300
commitbd6b7dfdda00bb4a6335f6d5b6ce24fbaaa35a26 (patch)
tree231dc99b003f69200c765da942c371c6a0d96cbb /drivers/mmc/host/cqhci-core.c
parent61840edc88138cb7e274ac530aeec6de36fbf386 (diff)
parent92b18252b91de567cd875f2e84722b10ab34ee28 (diff)
downloadlinux-bd6b7dfdda00bb4a6335f6d5b6ce24fbaaa35a26.tar.xz
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc/host/cqhci-core.c')
-rw-r--r--drivers/mmc/host/cqhci-core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/host/cqhci-core.c b/drivers/mmc/host/cqhci-core.c
index ca8329d55f43..b0d30c35c390 100644
--- a/drivers/mmc/host/cqhci-core.c
+++ b/drivers/mmc/host/cqhci-core.c
@@ -282,6 +282,9 @@ static void __cqhci_enable(struct cqhci_host *cq_host)
cqhci_writel(cq_host, cqcfg, CQHCI_CFG);
+ if (cqhci_readl(cq_host, CQHCI_CTL) & CQHCI_HALT)
+ cqhci_writel(cq_host, 0, CQHCI_CTL);
+
mmc->cqe_on = true;
if (cq_host->ops->enable)