--- linux-2.6.38/drivers/mmc/host/sdhci.c	2011-05-28 18:49:45.538077065 -0400
+++ linux-2.6.38/drivers/mmc/host/sdhci.c	2011-05-28 18:52:02.799702610 -0400
@@ -1520,7 +1520,8 @@
 		return;
 	}
 
-	if (intmask & SDHCI_INT_DATA_TIMEOUT)
+	if ((intmask & SDHCI_INT_DATA_TIMEOUT) &&
+	    !(intmask & SDHCI_INT_DATA_END))
 		host->data->error = -ETIMEDOUT;
 	else if (intmask & SDHCI_INT_DATA_END_BIT)
 		host->data->error = -EILSEQ;