diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2024-09-03 14:21:10 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2024-09-03 14:21:10 +0200 |
| commit | 64515b8e3e2270d48d8b56adf3b455b7efe76297 (patch) | |
| tree | 6f95d6fe4b5f207f3e0b4c47cba1ec322f96a958 /drivers/mmc | |
| parent | 4c0a6a0ac902dbf184ae7be1f1fce225cc0b7380 (diff) | |
| parent | aea62c744a9ae2a8247c54ec42138405216414da (diff) | |
| download | linux-64515b8e3e2270d48d8b56adf3b455b7efe76297.tar.gz linux-64515b8e3e2270d48d8b56adf3b455b7efe76297.tar.bz2 linux-64515b8e3e2270d48d8b56adf3b455b7efe76297.zip | |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.11-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.12.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/cqhci-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/cqhci-core.c b/drivers/mmc/host/cqhci-core.c index c14d7251d0bb..a02da26a1efd 100644 --- a/drivers/mmc/host/cqhci-core.c +++ b/drivers/mmc/host/cqhci-core.c @@ -617,7 +617,7 @@ static int cqhci_request(struct mmc_host *mmc, struct mmc_request *mrq) cqhci_writel(cq_host, 0, CQHCI_CTL); mmc->cqe_on = true; pr_debug("%s: cqhci: CQE on\n", mmc_hostname(mmc)); - if (cqhci_readl(cq_host, CQHCI_CTL) && CQHCI_HALT) { + if (cqhci_readl(cq_host, CQHCI_CTL) & CQHCI_HALT) { pr_err("%s: cqhci: CQE failed to exit halt state\n", mmc_hostname(mmc)); } |