From 9e111364e780bc93ea68aae03b41e31b09e44d5a Mon Sep 17 00:00:00 2001
From: Ulf Hansson <ulf.hansson@stericsson.com>
Date: Tue, 13 Dec 2011 16:58:43 +0100
Subject: [PATCH] --- yaml --- r: 277076 b: refs/heads/master c:
 3b6e3c73851a9a4b0e6ed9d378206341dd65e8a5 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/mmc/host/mmci.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 638092f0cc75..ae8c79732321 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b63038d6f4ca5d1849ce01d9fc5bb9cb426dec73
+refs/heads/master: 3b6e3c73851a9a4b0e6ed9d378206341dd65e8a5
diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c
index 826598115abd..0726e59fd418 100644
--- a/trunk/drivers/mmc/host/mmci.c
+++ b/trunk/drivers/mmc/host/mmci.c
@@ -755,8 +755,12 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,
 	}
 
 	if (!cmd->data || cmd->error) {
-		if (host->data)
+		if (host->data) {
+			/* Terminate the DMA transfer */
+			if (dma_inprogress(host))
+				mmci_dma_data_error(host);
 			mmci_stop_data(host);
+		}
 		mmci_request_end(host, cmd->mrq);
 	} else if (!(cmd->data->flags & MMC_DATA_READ)) {
 		mmci_start_data(host, cmd->data);