mmc: Merge branch fixes into next

storulf · storulf · commit 64515b8e3e22 · 2024-09-03T14:21:10.000+02:00
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 &lt;ulf.hansson@linaro.org&gt;
diff --git 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));
 		}

Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,7 @@ static int cqhci_request(struct mmc_host mmc, struct mmc_request mrq)`
`617`	`617`	`cqhci_writel(cq_host, 0, CQHCI_CTL);`
`618`	`618`	`mmc->cqe_on = true;`
`619`	`619`	`pr_debug("%s: cqhci: CQE on\n", mmc_hostname(mmc));`
`620`		`- if (cqhci_readl(cq_host, CQHCI_CTL) && CQHCI_HALT) {`
	`620`	`+ if (cqhci_readl(cq_host, CQHCI_CTL) & CQHCI_HALT) {`
`621`	`621`	`pr_err("%s: cqhci: CQE failed to exit halt state\n",`
`622`	`622`	`mmc_hostname(mmc));`
`623`	`623`	`}`