From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 30 Jan 2011 21:03:50 +0000 (+0000)
Subject: ARM: mmci: complete the transaction on error
X-Git-Tag: v3.12-rc1~7265^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ccff9b51825b7335889b780bdf7de84ca803e291;p=kernel%2Fkernel-generic.git

ARM: mmci: complete the transaction on error

When we encounter an error, make sure we complete the transaction
otherwise we'll leave the request dangling.

Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index b6fd6dc..175a623 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -319,7 +319,7 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data,
 	if (status & MCI_DATABLOCKEND)
 		dev_err(mmc_dev(host->mmc), "stray MCI_DATABLOCKEND interrupt\n");
 
-	if (status & MCI_DATAEND) {
+	if (status & MCI_DATAEND || data->error) {
 		mmci_stop_data(host);
 
 		if (!data->error)