From 45b41808e1d5c771fd6a922c55ef115472a6d46c Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 2 May 2006 20:02:39 +0100
Subject: [PATCH] --- yaml --- r: 26499 b: refs/heads/master c:
 58741e8b3603e56c3699550e8bc89cb136329343 h: refs/heads/master i:   26497:
 2221a69b62c6ffd8c1794ddaaefdef13bd9985c5   26495:
 7bd44c44f08374b089a47ba19fb8caffdc7c9e8d v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/mmc/imxmmc.c | 2 +-
 trunk/drivers/mmc/pxamci.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d1997156cd4f..a7131cdda9a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37be4e7809e0581db85387e126ae4da68c3d6286
+refs/heads/master: 58741e8b3603e56c3699550e8bc89cb136329343
diff --git a/trunk/drivers/mmc/imxmmc.c b/trunk/drivers/mmc/imxmmc.c
index 07f36c454bd6..bc271925099a 100644
--- a/trunk/drivers/mmc/imxmmc.c
+++ b/trunk/drivers/mmc/imxmmc.c
@@ -529,7 +529,7 @@ static int imxmci_data_done(struct imxmci_host *host, unsigned int stat)
 
 	data_error = imxmci_finish_data(host, stat);
 
-	if (host->req->stop && (data_error == MMC_ERR_NONE)) {
+	if (host->req->stop) {
 		imxmci_stop_clock(host);
 		imxmci_start_cmd(host, host->req->stop, 0);
 	} else {
diff --git a/trunk/drivers/mmc/pxamci.c b/trunk/drivers/mmc/pxamci.c
index eb42cb349420..15a5caa0bdeb 100644
--- a/trunk/drivers/mmc/pxamci.c
+++ b/trunk/drivers/mmc/pxamci.c
@@ -291,7 +291,7 @@ static int pxamci_data_done(struct pxamci_host *host, unsigned int stat)
 	pxamci_disable_irq(host, DATA_TRAN_DONE);
 
 	host->data = NULL;
-	if (host->mrq->stop && data->error == MMC_ERR_NONE) {
+	if (host->mrq->stop) {
 		pxamci_stop_clock(host);
 		pxamci_start_cmd(host, host->mrq->stop, 0);
 	} else {