From 7c890d76016fc94ab7b58a8cd35675153356314b Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@openmoko.org>
Date: Mon, 30 Jun 2008 22:40:25 +0100
Subject: [PATCH] --- yaml --- r: 102193 b: refs/heads/master c:
 679f0f8abd7187baaff40a47fe4733ae4c24cc9a h: refs/heads/master i:   102191:
 62cbd1bce6ffbdbc52c22249aa2edff241a6cbaf v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/mmc/host/s3cmci.c | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 968f3cddfa85..c4e82e1d6cc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be518018c6b9224c02284fb243207ef741c31ec6
+refs/heads/master: 679f0f8abd7187baaff40a47fe4733ae4c24cc9a
diff --git a/trunk/drivers/mmc/host/s3cmci.c b/trunk/drivers/mmc/host/s3cmci.c
index c6a4d3cadf2b..4db5bd7c0494 100644
--- a/trunk/drivers/mmc/host/s3cmci.c
+++ b/trunk/drivers/mmc/host/s3cmci.c
@@ -461,9 +461,19 @@ static irqreturn_t s3cmci_irq(int irq, void *dev_id)
 
 	if (mci_csta & S3C2410_SDICMDSTAT_CRCFAIL) {
 		if (cmd->flags & MMC_RSP_CRC) {
-			cmd->error = -EILSEQ;
-			host->status = "error: bad command crc";
-			goto fail_transfer;
+			if (host->mrq->cmd->flags & MMC_RSP_136) {
+				dbg(host, dbg_irq,
+				    "fixup: ignore CRC fail with long rsp\n");
+			} else {
+				/* note, we used to fail the transfer
+				 * here, but it seems that this is just
+				 * the hardware getting it wrong.
+				 *
+				 * cmd->error = -EILSEQ;
+				 * host->status = "error: bad command crc";
+				 * goto fail_transfer;
+				*/
+			}
 		}
 
 		mci_cclear |= S3C2410_SDICMDSTAT_CRCFAIL;