From 9109e66173b91bef50c0164b142fef36ede4fb86 Mon Sep 17 00:00:00 2001
From: Ragner Magalhaes <ragner.magalhaes@indt.org.br>
Date: Wed, 13 Jun 2007 19:09:28 +0200
Subject: [PATCH] --- yaml --- r: 57695 b: refs/heads/master c:
 0107a4b32e36dccd4456e2c5e34c5cd22c94e094 h: refs/heads/master i:   57693:
 dc9386a9badbaecbcd5b9a795820798854211a26   57691:
 04439e4473492cfb0397f21b64ad5fad51c7a186   57687:
 0e51c5795af071ba688ab5da06026a4b5b00cf27   57679:
 9e5941cdaa664a16f78d44a04e30a77f1b37912c   57663:
 c8974f34231f53e64d6d6e8481f2c4ee9b0c26d2 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/mmc/host/omap.c | 24 +++---------------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 2a9f282ac01d..8fa492504220 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0e1d1d075cc0efe9a3ac8579bce9393d070e09f
+refs/heads/master: 0107a4b32e36dccd4456e2c5e34c5cd22c94e094
diff --git a/trunk/drivers/mmc/host/omap.c b/trunk/drivers/mmc/host/omap.c
index 1914e65d4db1..b0824a38f425 100644
--- a/trunk/drivers/mmc/host/omap.c
+++ b/trunk/drivers/mmc/host/omap.c
@@ -522,28 +522,10 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
 		}
 
 		if (status & OMAP_MMC_STAT_CARD_ERR) {
-			if (host->cmd && host->cmd->opcode == MMC_STOP_TRANSMISSION) {
-				u32 response = OMAP_MMC_READ(host, RSP6)
-					| (OMAP_MMC_READ(host, RSP7) << 16);
-				/* STOP sometimes sets must-ignore bits */
-				if (!(response & (R1_CC_ERROR
-								| R1_ILLEGAL_COMMAND
-								| R1_COM_CRC_ERROR))) {
-					end_command = 1;
-					continue;
-				}
-			}
-
-			dev_dbg(mmc_dev(host->mmc), "card status error (CMD%d)\n",
+			dev_dbg(mmc_dev(host->mmc),
+				"ignoring card status error (CMD%d)\n",
 				host->cmd->opcode);
-			if (host->cmd) {
-				host->cmd->error = MMC_ERR_FAILED;
-				end_command = 1;
-			}
-			if (host->data) {
-				host->data->error = MMC_ERR_FAILED;
-				transfer_error = 1;
-			}
+			end_command = 1;
 		}
 
 		/*