diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:37:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:37:57 -0700 |
| commit | 7a203f3b089be4410fe065dd9927027eade94557 (patch) | |
| tree | dfccff61334ba6cf6047cbfca09fd6147a3a8d8a /drivers | |
| parent | dbb9be8a79802d1d1fd487d54ad48ac0b7fc17df (diff) | |
| parent | cda56ac29f2d8288d62978272856884d26e0b47b (diff) | |
| download | linux-3.10-7a203f3b089be4410fe065dd9927027eade94557.tar.gz linux-3.10-7a203f3b089be4410fe065dd9927027eade94557.tar.bz2 linux-3.10-7a203f3b089be4410fe065dd9927027eade94557.zip | |
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.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 9c50e6f1c23..34ce2703d29 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); |