---

yaml --- r: 113192 b: refs/heads/master c: 0d3e046 h: refs/heads/master v: v3
git-mirror · Oct 12, 2008 · c068395 · c068395
1 parent e91361e
commit c068395
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7244b85bd17313d7d300ee93ec7bfbca1f4ccf3d
+refs/heads/master: 0d3e0460f307e84904968aad6cff97bd688583d8
diff --git a/trunk/drivers/mmc/core/mmc_ops.c b/trunk/drivers/mmc/core/mmc_ops.c
@@ -248,8 +248,12 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
 
 	sg_init_one(&sg, data_buf, len);
 
-	if (card)
-		mmc_set_data_timeout(&data, card);
+	/*
+	 * The spec states that CSR and CID accesses have a timeout
+	 * of 64 clock cycles.
+	 */
+	data.timeout_ns = 0;
+	data.timeout_clks = 64;
 
 	mmc_wait_for_req(host, &mrq);