diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-11-12 09:22:28 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-11-12 09:23:16 +1000 |
| commit | 447212bb4f8ebd7d95dd6e160cd82c69c9a23c4c (patch) | |
| tree | 7f60893fe3757c5ac2077809e0f8764bd3944748 /drivers/mmc/host/cqhci-core.c | |
| parent | 951bad0bd9de63b4c71bfd69f0dd5824b96a8ee9 (diff) | |
| parent | 8bb7eca972ad531c9b149c0a51ab43a417385813 (diff) | |
BackMerge tag 'v5.15' into drm-next
I got a drm-fixes which had some 5.15 stuff in it, so to avoid
the mess just backmerge here.
Linux 5.15
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/mmc/host/cqhci-core.c')
| -rw-r--r-- | drivers/mmc/host/cqhci-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/host/cqhci-core.c b/drivers/mmc/host/cqhci-core.c index 38559a956330..31f841231609 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) |