r3579 - branches/src/target/kernel/2.6.24.x/patches

laforge at sita.openmoko.org laforge at sita.openmoko.org
Wed Dec 5 18:59:26 CET 2007


Author: laforge
Date: 2007-12-05 18:59:23 +0100 (Wed, 05 Dec 2007)
New Revision: 3579

Modified:
   branches/src/target/kernel/2.6.24.x/patches/s3cmci_dbg.patch
Log:
s3c_mci 2.6.24-rc4 merge: update patch to apply again


Modified: branches/src/target/kernel/2.6.24.x/patches/s3cmci_dbg.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/s3cmci_dbg.patch	2007-12-05 17:58:40 UTC (rev 3578)
+++ branches/src/target/kernel/2.6.24.x/patches/s3cmci_dbg.patch	2007-12-05 17:59:23 UTC (rev 3579)
@@ -1,26 +1,26 @@
 This patch is a workaround of some S3C2410 MMC chip bug
 
---- linux-2.6.22.1.orig/drivers/mmc/host/s3cmci.c
-+++ linux-2.6.22.1/drivers/mmc/host/s3cmci.c
-@@ -444,11 +444,17 @@
+Index: linux-2.6/drivers/mmc/host/s3cmci.c
+===================================================================
+--- linux-2.6.orig/drivers/mmc/host/s3cmci.c
++++ linux-2.6/drivers/mmc/host/s3cmci.c
+@@ -445,9 +445,16 @@
  
  	if (mci_csta & S3C2410_SDICMDSTAT_CRCFAIL) {
  		if (cmd->flags & MMC_RSP_CRC) {
--			cmd->error = MMC_ERR_BADCRC;
+-			cmd->error = -EILSEQ;
 -			host->status = "error: bad command crc";
 -			goto fail_transfer;
 +			if (host->mrq->cmd->flags & MMC_RSP_136) {
-+				dbg(host, dbg_irq, 
++				dbg(host, dbg_irq,
 +				    "fixup: ignore CRC fail with long rsp\n");
 +			} else {
 +#if 0
-+				cmd->error = MMC_ERR_BADCRC;
++				cmd->error = -EILSEQ;
 +				host->status = "error: bad command crc";
 +				goto fail_transfer;
 +#endif
 +			}
  		}
--
+ 
  		mci_cclear |= S3C2410_SDICMDSTAT_CRCFAIL;
- 	}
- 





More information about the commitlog mailing list