Merge "mmc: sdhci: Fix SDHCI_QUIRK2_IGNORE_DATATOUT_FOR_R1BCMD handling" (ccfb8c3d) · Commits · e / devices / android_kernel_sony_msm8998

drivers/mmc/host/sdhci.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -3041,11 +3041,6 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
		* above in sdhci_cmd_irq().
		*/
		if (host->cmd && (host->cmd->flags & MMC_RSP_BUSY)) {
		if (intmask & SDHCI_INT_DATA_TIMEOUT) {
		host->cmd->error = -ETIMEDOUT;
		tasklet_schedule(&host->finish_tasklet);
		return;
		}
		if (intmask & SDHCI_INT_DATA_END) {
		/*
		* Some cards handle busy-end interrupt
		@@ -3061,6 +3056,11 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
		if (host->quirks2 &
		SDHCI_QUIRK2_IGNORE_DATATOUT_FOR_R1BCMD)
		return;
		if (intmask & SDHCI_INT_DATA_TIMEOUT) {
		host->cmd->error = -ETIMEDOUT;
		tasklet_schedule(&host->finish_tasklet);
		return;
		}
		}

		pr_err("%s: Got data interrupt 0x%08x even "