From 1f88100f70979fa5e362b3826204a78122d4cb54 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Mon, 3 Dec 2012 16:14:37 +0800 Subject: [PATCH] --- yaml --- r: 350720 b: refs/heads/master c: bab53301c3846ae9a5e1142dca2976f434f70481 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/clk/clk-fixed-factor.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0e0196d9aad0..b111106b84ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4895084c87ab0973308021d755596798160b682a +refs/heads/master: bab53301c3846ae9a5e1142dca2976f434f70481 diff --git a/trunk/drivers/clk/clk-fixed-factor.c b/trunk/drivers/clk/clk-fixed-factor.c index a4899855c0f6..1ef271e47594 100644 --- a/trunk/drivers/clk/clk-fixed-factor.c +++ b/trunk/drivers/clk/clk-fixed-factor.c @@ -28,8 +28,11 @@ static unsigned long clk_factor_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) { struct clk_fixed_factor *fix = to_clk_fixed_factor(hw); + unsigned long long int rate; - return parent_rate * fix->mult / fix->div; + rate = (unsigned long long int)parent_rate * fix->mult; + do_div(rate, fix->div); + return (unsigned long)rate; } static long clk_factor_round_rate(struct clk_hw *hw, unsigned long rate,