commit ccff9b51825b7335889b780bdf7de84ca803e291
author Russell King <rmk+kernel@arm.linux.org.uk> Sun Jan 30 21:03:50 2011 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Mon Jan 31 10:53:23 2011 +0000
tree 884b6114a8fef7fc60fe784de68faa23f41aa73a
parent f5a106d9e2a5d947e106c3caace373ded1a695ed

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>

drivers/mmc/host/mmci.c

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 @@
 	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)