[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    ARM: mmci: complete the transaction on error
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2011-01-31 22:59:51
Message-ID: 201101312259.p0VMxpCL004554 () hera ! kernel ! org
[Download RAW message or body]

Gitweb:     http://git.kernel.org/linus/ccff9b51825b7335889b780bdf7de84ca803e291
Commit:     ccff9b51825b7335889b780bdf7de84ca803e291
Parent:     f5a106d9e2a5d947e106c3caace373ded1a695ed
Author:     Russell King <rmk+kernel@arm.linux.org.uk>
AuthorDate: Sun Jan 30 21:03:50 2011 +0000
Committer:  Russell King <rmk+kernel@arm.linux.org.uk>
CommitDate: Mon Jan 31 10:53:23 2011 +0000

    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 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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)
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]