MMC fix for 2.6.29-rc8
Linus, please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus
to receive a fix for a regression that broke MMC cards:
drivers/mmc/core/mmc_ops.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-)
Adrian Hunter (1):
mmc: fix data timeout for SEND_EXT_CSD
drivers/mmc/core/mmc_ops.c +9 -6
@@ -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);
Signature · 6 lines
-- Pierre Ossman WARNING: This correspondence is being monitored by the Swedish government. Make sure your server uses encryption for SMTP traffic and consider using PGP for end-to-end encryption.