Skip to content

Commit a673347

Browse files
Guru Das Srinageshthierryreding
authored andcommitted
clk: pwm: Use 64-bit division function
Since the PWM framework is switching struct pwm_args.period's datatype to u64, prepare for this transition by using div64_u64() to handle a 64-bit divisor. Also ensure that divide-by-zero (with fixed_rate as denominator) does not happen with an explicit check with probe failure as a consequence. Signed-off-by: Guru Das Srinagesh <[email protected]> Acked-by: Stephen Boyd <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
1 parent 134ada1 commit a673347

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/clk/clk-pwm.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,12 @@ static int clk_pwm_probe(struct platform_device *pdev)
8989
}
9090

9191
if (of_property_read_u32(node, "clock-frequency", &clk_pwm->fixed_rate))
92-
clk_pwm->fixed_rate = NSEC_PER_SEC / pargs.period;
92+
clk_pwm->fixed_rate = div64_u64(NSEC_PER_SEC, pargs.period);
93+
94+
if (!clk_pwm->fixed_rate) {
95+
dev_err(&pdev->dev, "fixed_rate cannot be zero\n");
96+
return -EINVAL;
97+
}
9398

9499
if (pargs.period != NSEC_PER_SEC / clk_pwm->fixed_rate &&
95100
pargs.period != DIV_ROUND_UP(NSEC_PER_SEC, clk_pwm->fixed_rate)) {

0 commit comments

Comments
 (0)