From da393bad0611de9515a07f799d869941e72dd7fe Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 5 Jan 2011 00:44:32 +0100 Subject: [PATCH] --- yaml --- r: 228925 b: refs/heads/master c: e9b86841b372de01ae865080118e29159d8b7c39 h: refs/heads/master i: 228923: 06a9e9b388112918bb61f0c6f64b3bd6851a3348 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/core/core.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b0469469e4a6..d546d8bc7ff5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bd6a935555b06622fa7f47a9c411b8a7812e4dc +refs/heads/master: e9b86841b372de01ae865080118e29159d8b7c39 diff --git a/trunk/drivers/mmc/core/core.c b/trunk/drivers/mmc/core/core.c index 4b1d8fb04e9b..6625c057be05 100644 --- a/trunk/drivers/mmc/core/core.c +++ b/trunk/drivers/mmc/core/core.c @@ -299,8 +299,9 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card) unsigned int timeout_us, limit_us; timeout_us = data->timeout_ns / 1000; - timeout_us += data->timeout_clks * 1000 / - (mmc_host_clk_rate(card->host) / 1000); + if (mmc_host_clk_rate(card->host)) + timeout_us += data->timeout_clks * 1000 / + (mmc_host_clk_rate(card->host) / 1000); if (data->flags & MMC_DATA_WRITE) /*