Commit 78ffab97 authored by Derek Basehore's avatar Derek Basehore Committed by Greg Kroah-Hartman

backlight: pwm_bl: Fix overflow condition


[ Upstream commit 5d0c49ac ]

This fixes an overflow condition that can happen with high max
brightness and period values in compute_duty_cycle. This fixes it by
using a 64 bit variable for computing the duty cycle.
Signed-off-by: default avatarDerek Basehore <dbasehore@chromium.org>
Acked-by: default avatarThierry Reding <thierry.reding@gmail.com>
Reviewed-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ec5f7a3
...@@ -79,14 +79,17 @@ static void pwm_backlight_power_off(struct pwm_bl_data *pb) ...@@ -79,14 +79,17 @@ static void pwm_backlight_power_off(struct pwm_bl_data *pb)
static int compute_duty_cycle(struct pwm_bl_data *pb, int brightness) static int compute_duty_cycle(struct pwm_bl_data *pb, int brightness)
{ {
unsigned int lth = pb->lth_brightness; unsigned int lth = pb->lth_brightness;
int duty_cycle; u64 duty_cycle;
if (pb->levels) if (pb->levels)
duty_cycle = pb->levels[brightness]; duty_cycle = pb->levels[brightness];
else else
duty_cycle = brightness; duty_cycle = brightness;
return (duty_cycle * (pb->period - lth) / pb->scale) + lth; duty_cycle *= pb->period - lth;
do_div(duty_cycle, pb->scale);
return duty_cycle + lth;
} }
static int pwm_backlight_update_status(struct backlight_device *bl) static int pwm_backlight_update_status(struct backlight_device *bl)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment