diff options
| author | Adrian Hunter <adrian.hunter@nokia.com> | 2009-02-10 17:32:33 +0300 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2009-03-08 16:46:04 +0300 |
| commit | cda56ac29f2d8288d62978272856884d26e0b47b (patch) | |
| tree | ff9290ffa90f8fb17ebd4dda181cf799ca6bc705 /drivers/mmc | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
| download | linux-cda56ac29f2d8288d62978272856884d26e0b47b.tar.xz | |
mmc: fix data timeout for SEND_EXT_CSD
Commit 0d3e0460f307e84904968aad6cff97bd688583d8
"MMC: CSD and CID timeout values" inadvertently broke
the timeout for the MMC command SEND_EXT_CSD.
This patch puts it back again.
Depending on the characteristics of the controller,
this bug may prevent the use of MMC cards.
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc')
| -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 9c50e6f1c236..34ce2703d29a 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); |