---

yaml --- r: 45335 b: refs/heads/master c: e47c222 h: refs/heads/master i: 45333: 1bb81fe 45331: d5be550 45327: cc31845 v: v3
git-mirror · Jan 8, 2007 · 4e0c139 · 4e0c139
1 parent d698d63
commit 4e0c139
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db6ccbb61c1291c8aaefadcc8304444f27eeb88d
+refs/heads/master: e47c222b22cd53c317a5573e1dc5f9e0cbd46380
diff --git a/trunk/drivers/mmc/mmci.c b/trunk/drivers/mmc/mmci.c
@@ -42,6 +42,8 @@ mmci_request_end(struct mmci_host *host, struct mmc_request *mrq)
 {
 	writel(0, host->base + MMCICOMMAND);
 
+	BUG_ON(host->data);
+
 	host->mrq = NULL;
 	host->cmd = NULL;
 
@@ -198,6 +200,8 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,
 	}
 
 	if (!cmd->data || cmd->error != MMC_ERR_NONE) {
+		if (host->data)
+			mmci_stop_data(host);
 		mmci_request_end(host, cmd->mrq);
 	} else if (!(cmd->data->flags & MMC_DATA_READ)) {
 		mmci_start_data(host, cmd->data);