From 4e0c1394318e7cb0b83a10e0161922b316819ef2 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 8 Jan 2007 16:42:51 +0000 Subject: [PATCH] --- yaml --- r: 45335 b: refs/heads/master c: e47c222b22cd53c317a5573e1dc5f9e0cbd46380 h: refs/heads/master i: 45333: 1bb81fea2a8aab5bc23636df5c5031842ca6a30a 45331: d5be550be03a0ca5f91b6222a4701458393a2777 45327: cc31845ca0dea35b619328a5d34a7c12656c1b13 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/mmci.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dd33edb296e0..5caaf32348c6 100644 --- 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 index e9b80e920266..ccfe6561be24 100644 --- 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);