From: Chuanxiao Dong <chuanxiao.dong@intel.com>
To: linux-mmc@vger.kernel.org, cjb@laptop.org
Cc: adrian.hunter@nokia.com, linus.walleij@linaro.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/1]mmc: fix division by zero when calculate mmc erase time
Date: Thu, 24 Feb 2011 19:18:01 +0800 [thread overview]
Message-ID: <20110224111801.GA7169@intel.com> (raw)
Since if clock gating feature is enabled, the clock frequency may be zero when
host clock is gated. In such scenario, mmc_set_mmc_erase_timeout() may have a
division by zero bug.
So this patch used mmc_host_clk_rate() to fix this.
Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com>
---
drivers/mmc/core/core.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 34a7e8c..12d0eb8 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1201,8 +1201,14 @@ static void mmc_set_mmc_erase_timeout(struct mmc_card *card,
* less but not that much less, so fudge it by multiplying by 2.
*/
timeout_clks <<= 1;
- timeout_us += (timeout_clks * 1000) /
- (card->host->ios.clock / 1000);
+
+ /*
+ * at this moment, host controller maybe clock gated, so make
+ * sure we can get a correct host clock freq.
+ */
+ if (mmc_host_clk_rate(card->host))
+ timeout_us += (timeout_clks * 1000) /
+ (mmc_host_clk_rate(card->host) / 1000);
erase_timeout = timeout_us / 1000;
--
1.6.6.1
next reply other threads:[~2011-02-24 11:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-24 11:18 Chuanxiao Dong [this message]
2011-02-24 11:37 ` [PATCH 1/1]mmc: fix division by zero when calculate mmc erase time Marc Koschewski
2011-02-24 12:09 ` Dong, Chuanxiao
2011-02-24 12:22 ` Marc Koschewski
2011-02-24 12:25 ` Dong, Chuanxiao
2011-02-24 12:34 ` Marc Koschewski
2011-02-24 12:35 ` Linus Walleij
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=20110224111801.GA7169@intel.com \
--to=chuanxiao.dong@intel.com \
--cc=adrian.hunter@nokia.com \
--cc=cjb@laptop.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@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