summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-08 10:37:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-08 10:37:57 -0700
commit7a203f3b089be4410fe065dd9927027eade94557 (patch)
treedfccff61334ba6cf6047cbfca09fd6147a3a8d8a /drivers
parentdbb9be8a79802d1d1fd487d54ad48ac0b7fc17df (diff)
parentcda56ac29f2d8288d62978272856884d26e0b47b (diff)
downloadop-kernel-dev-7a203f3b089be4410fe065dd9927027eade94557.zip
op-kernel-dev-7a203f3b089be4410fe065dd9927027eade94557.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: mmc: fix data timeout for SEND_EXT_CSD
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/core/mmc_ops.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 9c50e6f..34ce270 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -248,12 +248,15 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
sg_init_one(&sg, data_buf, len);
- /*
- * The spec states that CSR and CID accesses have a timeout
- * of 64 clock cycles.
- */
- data.timeout_ns = 0;
- data.timeout_clks = 64;
+ if (opcode == MMC_SEND_CSD || opcode == MMC_SEND_CID) {
+ /*
+ * The spec states that CSR and CID accesses have a timeout
+ * of 64 clock cycles.
+ */
+ data.timeout_ns = 0;
+ data.timeout_clks = 64;
+ } else
+ mmc_set_data_timeout(&data, card);
mmc_wait_for_req(host, &mrq);
OpenPOWER on IntegriCloud