X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fmmc%2Fmmci.c;h=ccfe6561be240ec65dadbbab2ea56ce0166cd001;hb=11354d03afe9dd0d114e078057158baad4b4eee9;hp=e9b80e9202664bbfa8cd84a6b302b48ae9154560;hpb=ec0bf39a471bf6fcd01def2bd677128cea940b73;p=powerpc.git

diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c
index e9b80e9202..ccfe6561be 100644
--- a/drivers/mmc/mmci.c
+++ b/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);