Merge "mmc: cmdq_hci: Do not handle other requests in case of error." (697e91bd) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/mmc/host/cmdq_hci.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -924,6 +924,8 @@ irqreturn_t cmdq_irq(struct mmc_host *mmc, int err)
		err_info = cmdq_readl(cq_host, CQTERRI);
		pr_err("%s: err: %d status: 0x%08x task-err-info (0x%08lx)\n",
		mmc_hostname(mmc), err, status, err_info);
		/* Dump the registers before clearing Interrupt */
		cmdq_dumpregs(cq_host);

		/*
		* Need to halt CQE in case of error in interrupt context itself
		@@ -947,7 +949,6 @@ irqreturn_t cmdq_irq(struct mmc_host *mmc, int err)
		*/
		cmdq_writel(cq_host, status, CQIS);

		cmdq_dumpregs(cq_host);

		if (!err_info) {
		/*
		@@ -1102,6 +1103,7 @@ irqreturn_t cmdq_irq(struct mmc_host *mmc, int err)
		}
		}
		cmdq_finish_data(mmc, tag);
		goto hac;
		} else {
		cmdq_writel(cq_host, status, CQIS);
		}