Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e6f918bf39773d712ab5b457bff54ade3bda0cb1
Commit:     e6f918bf39773d712ab5b457bff54ade3bda0cb1
Parent:     ce252edd869ba1fee6a9a6f83e20f349d4c4d669
Author:     Pierre Ossman <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 7 14:11:55 2007 +0200
Committer:  Pierre Ossman <[EMAIL PROTECTED]>
CommitDate: Sun Sep 23 21:16:01 2007 +0200

    mmc: fix sdio timeout calculation
    
    SDIO doesn't have a CSD so it uses different timeout values than
    SD memory.
    
    Signed-off-by: Pierre Ossman <[EMAIL PROTECTED]>
---
 drivers/mmc/core/core.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 07c03cb..9d29bed 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -232,6 +232,15 @@ void mmc_set_data_timeout(struct mmc_data *data, const 
struct mmc_card *card)
        unsigned int mult;
 
        /*
+        * SDIO cards only define an upper 1 s limit on access.
+        */
+       if (mmc_card_sdio(card)) {
+               data->timeout_ns = 1000000000;
+               data->timeout_clks = 0;
+               return;
+       }
+
+       /*
         * SD cards use a 100 multiplier rather than 10
         */
        mult = mmc_card_sd(card) ? 100 : 10;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to