diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-03 13:46:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-03 13:46:11 -0400 |
| commit | d1b65edf4d1e6506349196a2f665185eeca2a114 (patch) | |
| tree | 9615fb8a998e883b33bae9289ed00e7ec3194977 | |
| parent | 51f269a6ecc701f9932eff5b253a1f89746be6bd (diff) | |
| parent | b05d39466ba111fc3775d5d46180b73c34ebe8f7 (diff) | |
| download | linux-stable-d1b65edf4d1e6506349196a2f665185eeca2a114.tar.gz linux-stable-d1b65edf4d1e6506349196a2f665185eeca2a114.tar.bz2 linux-stable-d1b65edf4d1e6506349196a2f665185eeca2a114.zip | |
Merge tag 'leds-6.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/linux
Pull LED fix from Johan Hovold:
"Here's a fix for a regression in 6.4-rc1 which broke the backlight on
machines such as the Lenovo ThinkPad X13s"
Acked-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/lkml/20230602091928.GR449117@google.com/
* tag 'leds-6.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/linux:
leds: qcom-lpg: Fix PWM period limits
| -rw-r--r-- | drivers/leds/rgb/leds-qcom-lpg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/leds/rgb/leds-qcom-lpg.c b/drivers/leds/rgb/leds-qcom-lpg.c index 55a037234df1..1c849814a491 100644 --- a/drivers/leds/rgb/leds-qcom-lpg.c +++ b/drivers/leds/rgb/leds-qcom-lpg.c @@ -312,14 +312,14 @@ static int lpg_calc_freq(struct lpg_channel *chan, uint64_t period) max_res = LPG_RESOLUTION_9BIT; } - min_period = (u64)NSEC_PER_SEC * - div64_u64((1 << pwm_resolution_arr[0]), clk_rate_arr[clk_len - 1]); + min_period = div64_u64((u64)NSEC_PER_SEC * (1 << pwm_resolution_arr[0]), + clk_rate_arr[clk_len - 1]); if (period <= min_period) return -EINVAL; /* Limit period to largest possible value, to avoid overflows */ - max_period = (u64)NSEC_PER_SEC * max_res * LPG_MAX_PREDIV * - div64_u64((1 << LPG_MAX_M), 1024); + max_period = div64_u64((u64)NSEC_PER_SEC * max_res * LPG_MAX_PREDIV * (1 << LPG_MAX_M), + 1024); if (period > max_period) period = max_period; |