Merge "mmc: sdhci: Fix SDHCI_QUIRK2_IGNORE_DATATOUT_FOR_R1BCMD handling" (078a5f23) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/mmc/host/sdhci.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -3088,12 +3088,6 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
		* above in sdhci_cmd_irq().
		*/
		if (data_cmd && (data_cmd->flags & MMC_RSP_BUSY)) {
		if (intmask & SDHCI_INT_DATA_TIMEOUT) {
		host->data_cmd = NULL;
		data_cmd->error = -ETIMEDOUT;
		sdhci_finish_mrq(host, data_cmd->mrq);
		return;
		}
		if (intmask & SDHCI_INT_DATA_END) {
		host->data_cmd = NULL;
		/*
		@@ -3110,6 +3104,12 @@ 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->data_cmd = NULL;
		data_cmd->error = -ETIMEDOUT;
		sdhci_finish_mrq(host, data_cmd->mrq);
		return;
		}
		}

		/*