Commit cda56ac2 authored Feb 10, 2009 by Adrian Hunter Committed by Pierre Ossman Mar 08, 2009

mmc: fix data timeout for SEND_EXT_CSD



Commit 0d3e0460
"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>

parent 559595a9

drivers/mmc/core/mmc_ops.c

+9 −6

Original line number	Diff line number	Diff line
		@@ -248,12 +248,15 @@ mmc_send_cxd_data(struct mmc_card card, struct mmc_host host,

		sg_init_one(&sg, data_buf, len);

		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);