diff options
author | Tony Prisk <linux@prisktech.co.nz> | 2012-12-26 19:14:31 -0500 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2013-01-15 19:16:25 -0500 |
commit | 58eb5a6763deab71208fbff15b09055fac884b11 (patch) | |
tree | bb5391c140cda7c3c6675f02380f88bbe6babd95 /drivers/clk | |
parent | 72480014b86c8b51fb51c5c6a0525876055c37c7 (diff) |
clk: vt8500: Fix division-by-0 when requested rate=0
A request to vt8500_dclk_(round_rate/set_rate) with rate=0 results
in a division-by-0 in the kernel.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/clk-vt8500.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/clk/clk-vt8500.c b/drivers/clk/clk-vt8500.c index 3306c2b1906c..db7d41f25046 100644 --- a/drivers/clk/clk-vt8500.c +++ b/drivers/clk/clk-vt8500.c | |||
@@ -121,7 +121,12 @@ static long vt8500_dclk_round_rate(struct clk_hw *hw, unsigned long rate, | |||
121 | unsigned long *prate) | 121 | unsigned long *prate) |
122 | { | 122 | { |
123 | struct clk_device *cdev = to_clk_device(hw); | 123 | struct clk_device *cdev = to_clk_device(hw); |
124 | u32 divisor = *prate / rate; | 124 | u32 divisor; |
125 | |||
126 | if (rate == 0) | ||
127 | return 0; | ||
128 | |||
129 | divisor = *prate / rate; | ||
125 | 130 | ||
126 | /* If prate / rate would be decimal, incr the divisor */ | 131 | /* If prate / rate would be decimal, incr the divisor */ |
127 | if (rate * divisor < *prate) | 132 | if (rate * divisor < *prate) |
@@ -142,9 +147,14 @@ static int vt8500_dclk_set_rate(struct clk_hw *hw, unsigned long rate, | |||
142 | unsigned long parent_rate) | 147 | unsigned long parent_rate) |
143 | { | 148 | { |
144 | struct clk_device *cdev = to_clk_device(hw); | 149 | struct clk_device *cdev = to_clk_device(hw); |
145 | u32 divisor = parent_rate / rate; | 150 | u32 divisor; |
146 | unsigned long flags = 0; | 151 | unsigned long flags = 0; |
147 | 152 | ||
153 | if (rate == 0) | ||
154 | return 0; | ||
155 | |||
156 | divisor = parent_rate / rate; | ||
157 | |||
148 | /* If prate / rate would be decimal, incr the divisor */ | 158 | /* If prate / rate would be decimal, incr the divisor */ |
149 | if (rate * divisor < *prate) | 159 | if (rate * divisor < *prate) |
150 | divisor++; | 160 | divisor++; |