Merge "mmc: cmdq_hci: Enable legacy interrupts immediately after halt" (d4d8afe7) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/mmc/host/cmdq_hci.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -966,6 +966,9 @@ skip_cqterri:
		if (status & CQIS_HAC) {
		if (cq_host->ops->post_cqe_halt)
		cq_host->ops->post_cqe_halt(mmc);
		/* halt done: re-enable legacy interrupts */
		if (cq_host->ops->clear_set_irqs)
		cq_host->ops->clear_set_irqs(mmc, false);
		/* halt is completed, wakeup waiting thread */
		complete(&cq_host->halt_comp);
		}
		@@ -1038,10 +1041,6 @@ static int cmdq_halt(struct mmc_host *mmc, bool halt)
		} else {
		MMC_TRACE(mmc, "%s: halt done , retries: %d\n",
		__func__, retries);
		/* halt done: re-enable legacy interrupts */
		if (cq_host->ops->clear_set_irqs)
		cq_host->ops->clear_set_irqs(mmc,
		false);
		break;
		}
		}