---

yaml --- r: 277076 b: refs/heads/master c: 3b6e3c7 h: refs/heads/master v: v3
git-mirror · Dec 18, 2011 · 9e11136 · 9e11136
1 parent f3001d4
commit 9e11136
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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);