Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83671f2e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: cmdq: Set the timeout before unhalt"

parents 47bd9ba7 d6f8b69f
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -763,6 +763,8 @@ static int cmdq_halt(struct mmc_host *mmc, bool halt)
			cq_host->ops->clear_set_irqs(mmc, false);
		ret = ret ? 0 : -ETIMEDOUT;
	} else {
		if (cq_host->ops->set_data_timeout)
			cq_host->ops->set_data_timeout(mmc, 0xf);
		if (cq_host->ops->clear_set_irqs)
			cq_host->ops->clear_set_irqs(mmc, true);
		cmdq_writel(cq_host, cmdq_readl(cq_host, CQCTL) & ~HALT,