PERFORCE change 107212 for review

[Warner Losh]

http://perforce.freebsd.org/chv.cgi?CH=107212

Change 107212 by imp at imp_lighthouse on 2006/10/03 20:09:31

	Turns out this is a bad idea

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#19 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#19 (text+ko) ====

@@ -501,12 +501,12 @@
 	sr = RD4(sc, MCI_SR) & RD4(sc, MCI_IMR);
 	printf("i 0x%x\n", sr);
 	cmd = sc->curcmd;
-	// Ignore CRC errors on CMD2 and ACMD47, per relevant standards
-	if (cmd->opcode == MMC_SEND_OP_COND ||
-	    cmd->opcode == ACMD_SD_SEND_OP_COND)
-		sr &= ~MCI_SR_RCRCE;
 	if (sr & MCI_SR_ERROR) {
-		if (sr & (MCI_SR_RTOE | MCI_SR_DTOE))
+		// Ignore CRC errors on CMD2 and ACMD47, per relevant standards
+		if ((sr & MCI_SR_RCRCE) && (cmd->opcode == MMC_SEND_OP_COND ||
+		    cmd->opcode == ACMD_SD_SEND_OP_COND))
+			cmd->error = MMC_ERR_NONE;
+		else if (sr & (MCI_SR_RTOE | MCI_SR_DTOE))
 			cmd->error = MMC_ERR_TIMEOUT;
 		else if (sr & (MCI_SR_RCRCE | MCI_SR_DCRCE))
 			cmd->error = MMC_ERR_BADCRC;