Commit ec014cba authored Jan 26, 2016 by Russell King Committed by Ulf Hansson Feb 29, 2016

mmc: sdhci: clean up command error handling



Avoid multiple tests while handling a command error; simplify the code.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
[ Goes with "mmc: sdhci: fix command response CRC error handling" ]
Cc: stable@vger.kernel.org # v4.5+
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 96776200

drivers/mmc/host/sdhci.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -2323,13 +2323,13 @@ static void sdhci_cmd_irq(struct sdhci_host host, u32 intmask, u32 mask)
		return;
		}

		if (intmask & (SDHCI_INT_TIMEOUT \| SDHCI_INT_CRC \|
		SDHCI_INT_END_BIT \| SDHCI_INT_INDEX)) {
		if (intmask & SDHCI_INT_TIMEOUT)
		host->cmd->error = -ETIMEDOUT;
		else if (intmask & (SDHCI_INT_CRC \| SDHCI_INT_END_BIT \|
		SDHCI_INT_INDEX))
		else
		host->cmd->error = -EILSEQ;

		if (host->cmd->error) {
		tasklet_schedule(&host->finish_tasklet);
		return;
		}