---

yaml
---
r: 57695
b: refs/heads/master
c: 0107a4b
h: refs/heads/master
i:
  57693: dc9386a
  57691: 04439e4
  57687: 0e51c57
  57679: 9e5941c
  57663: c8974f3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0e1d1d075cc0efe9a3ac8579bce9393d070e09f
+refs/heads/master: 0107a4b32e36dccd4456e2c5e34c5cd22c94e094

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;
 		}
 
 		/*