lkml.org 
[lkml]   [2009]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] mmc_core: 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.

    Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
    ---
    drivers/mmc/core/mmc_ops.c | 16 ++++++++++------
    1 files changed, 10 insertions(+), 6 deletions(-)

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

    --
    1.5.6.3

    \
     
     \ /
      Last update: 2009-02-11 15:39    [W:0.036 / U:148.344 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site