Patch "mmc: sdhci: clean up command error handling" has been added to the 4.5-stable tree

Patch "mmc: sdhci: clean up command error handling" has been added to the 4.5-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    mmc: sdhci: clean up command error handling

to the 4.5-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     mmc-sdhci-clean-up-command-error-handling.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From ec014cbacf6229c583cb832726ca39be1ae3d8c3 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 26 Jan 2016 13:39:39 +0000
Subject: mmc: sdhci: clean up command error handling

From: Russell King <rmk+kernel@arm.linux.org.uk>

commit ec014cbacf6229c583cb832726ca39be1ae3d8c3 upstream.

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" ]
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/mmc/host/sdhci.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2323,13 +2323,13 @@ static void sdhci_cmd_irq(struct sdhci_h
 		return;
 	}
 
-	if (intmask & SDHCI_INT_TIMEOUT)
-		host->cmd->error = -ETIMEDOUT;
-	else if (intmask & (SDHCI_INT_CRC | SDHCI_INT_END_BIT |
-			SDHCI_INT_INDEX))
-		host->cmd->error = -EILSEQ;
+	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
+			host->cmd->error = -EILSEQ;
 
-	if (host->cmd->error) {
 		tasklet_schedule(&host->finish_tasklet);
 		return;
 	}


Patches currently in stable-queue which might be from rmk+kernel@arm.linux.org.uk are

queue-4.5/mmc-sdhci-fix-command-response-crc-error-handling.patch
queue-4.5/mmc-sdhci-avoid-unnecessary-mapping-unmapping-of-align-buffer.patch
queue-4.5/mmc-sdhci-move-initialisation-of-command-error-member.patch
queue-4.5/mmc-sdhci-fix-data-timeout-part-2.patch
queue-4.5/mmc-sdhci-clean-up-command-error-handling.patch
queue-4.5/mmc-sdhci-further-fix-for-dma-unmapping-in-sdhci_post_req.patch
queue-4.5/mmc-sdhci-pxav3-fix-higher-speed-mode-capabilities.patch
queue-4.5/mmc-sdhci-fix-data-timeout-part-1.patch
queue-4.5/mmc-sdhci-plug-dma-mapping-leak-on-error.patch