From: Matt Fleming <matt@console-pimps.org>
To: Adrian Hunter <ext-adrian.hunter@nokia.com>
Cc: Pierre Ossman <drzeus-mmc@drzeus.cx>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] mmc_core: fix data timeout for SEND_EXT_CSD
Date: Wed, 11 Feb 2009 13:30:04 +0000 [thread overview]
Message-ID: <20090211133004.GH478@console-pimps.org> (raw)
In-Reply-To: <4991A00B.8040002@nokia.com>
On Tue, Feb 10, 2009 at 05:40:59PM +0200, Adrian Hunter wrote:
> diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
> index 9c50e6f..418a270 100644
> --- a/drivers/mmc/core/mmc_ops.c
> +++ b/drivers/mmc/core/mmc_ops.c
> @@ -248,12 +248,16 @@ 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 (!mmc_host_is_spi(card->host) && opcode == MMC_SEND_EXT_CSD)
> + mmc_set_data_timeout(&data, card);
> + else {
> + /*
> + * The spec states that CSR and CID accesses have a timeout
> + * of 64 clock cycles (8 for SPI).
> + */
> + data.timeout_ns = 0;
> + data.timeout_clks = 64;
> + }
>
> mmc_wait_for_req(host, &mrq);
>
Doh! You're right, I did inadvertently break this. Your fix looks good.
next prev parent reply other threads:[~2009-02-11 13:30 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-10 15:40 [PATCH] mmc_core: fix data timeout for SEND_EXT_CSD Adrian Hunter
2009-02-11 13:30 ` Matt Fleming [this message]
2009-02-11 13:56 ` Adrian Hunter
2009-02-11 14:49 ` Adrian Hunter
2009-02-15 21:46 ` Andrew Morton
2009-02-18 20:16 ` Pierre Ossman
2009-02-19 7:33 ` Adrian Hunter
2009-02-19 11:22 ` Matt Fleming
2009-02-19 12:12 ` Adrian Hunter
2009-03-02 19:55 ` Pierre Ossman
2009-03-03 11:48 ` Adrian Hunter
2009-03-08 13:46 ` Pierre Ossman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090211133004.GH478@console-pimps.org \
--to=matt@console-pimps.org \
--cc=drzeus-mmc@drzeus.cx \
--cc=ext-adrian.hunter@nokia.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox