Commit-ID: 38409d726bc6413d39f082f60bc803f52d8b5849 Gitweb: http://git.kernel.org/tip/38409d726bc6413d39f082f60bc803f52d8b5849 Author: Magnus Damm <damm@xxxxxxxxxxxxx> AuthorDate: Mon, 2 Aug 2010 09:24:05 +0000 Committer: Paul Mundt <lethal@xxxxxxxxxxxx> CommitDate: Wed, 4 Aug 2010 16:01:29 +0900 clocksource: sh_cmt: Rate calculation fix Fix the rate calculation in the CMT driver. Without this fix the clocksource runs way too fast and we get a divide-by-zero error. Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx> Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx> --- drivers/clocksource/sh_cmt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index ed8e07b..a446116 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c @@ -445,7 +445,7 @@ static int sh_cmt_register_clocksource(struct sh_cmt_priv *p, /* clk_get_rate() needs an enabled clock */ clk_enable(p->clk); - p->rate = clk_get_rate(p->clk) / (p->width == 16) ? 512 : 8; + p->rate = clk_get_rate(p->clk) / ((p->width == 16) ? 512 : 8); clk_disable(p->clk); /* TODO: calculate good shift from rate and counter bit width */ -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|