Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58eb5a67 authored by Tony Prisk's avatar Tony Prisk Committed by Mike Turquette
Browse files

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: default avatarTony Prisk <linux@prisktech.co.nz>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent 72480014

drivers/clk/clk-vt8500.c

+12 −2
Original line number Original line Diff line number Diff line
@@ -121,7 +121,12 @@ static long vt8500_dclk_round_rate(struct clk_hw *hw, unsigned long rate, 
				unsigned long *prate)

				unsigned long *prate)

{

{

	struct clk_device *cdev = to_clk_device(hw);

	struct clk_device *cdev = to_clk_device(hw);

	u32 divisor = *prate / rate;

	u32 divisor;



	if (rate == 0)

		return 0;



	divisor = *prate / rate;





	/* If prate / rate would be decimal, incr the divisor */

	/* If prate / rate would be decimal, incr the divisor */

	if (rate * divisor < *prate)

	if (rate * divisor < *prate)
@@ -142,9 +147,14 @@ static int vt8500_dclk_set_rate(struct clk_hw *hw, unsigned long rate, 
				unsigned long parent_rate)

				unsigned long parent_rate)

{

{

	struct clk_device *cdev = to_clk_device(hw);

	struct clk_device *cdev = to_clk_device(hw);

	u32 divisor = parent_rate / rate;

	u32 divisor;

	unsigned long flags = 0;

	unsigned long flags = 0;





	if (rate == 0)

		return 0;



	divisor =  parent_rate / rate;



	/* If prate / rate would be decimal, incr the divisor */

	/* If prate / rate would be decimal, incr the divisor */

	if (rate * divisor < *prate)

	if (rate * divisor < *prate)

		divisor++;

		divisor++;