diff options
| author | Thomas Weißschuh <linux@weissschuh.net> | 2024-06-13 17:24:51 +0200 |
|---|---|---|
| committer | Lee Jones <lee@kernel.org> | 2024-06-26 17:56:07 +0200 |
| commit | ab477b766edd3bfb6321a6e3df4c790612613fae (patch) | |
| tree | c03855177ca31ec1d0e491c0448173035d636b9e /drivers/leds/led-triggers.c | |
| parent | leds: spi-byte: Move OF ID table closer to their user (diff) | |
| download | linux-ab477b766edd3bfb6321a6e3df4c790612613fae.tar.xz linux-ab477b766edd3bfb6321a6e3df4c790612613fae.zip | |
leds: triggers: Flush pending brightness before activating trigger
The race fixed in timer_trig_activate() between a blocking
set_brightness() call and trigger->activate() can affect any trigger.
So move the call to flush_work() into led_trigger_set() where it can
avoid the race for all triggers.
Fixes: 0db37915d912 ("leds: avoid races with workqueue")
Fixes: 8c0f693c6eff ("leds: avoid flush_work in atomic context")
Cc: stable@vger.kernel.org
Tested-by: Dustin L. Howett <dustin@howett.net>
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://lore.kernel.org/r/20240613-led-trigger-flush-v2-1-f4f970799d77@weissschuh.net
Signed-off-by: Lee Jones <lee@kernel.org>
Diffstat (limited to 'drivers/leds/led-triggers.c')
| -rw-r--r-- | drivers/leds/led-triggers.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c index 59deadb86335..78eb20093b2c 100644 --- a/drivers/leds/led-triggers.c +++ b/drivers/leds/led-triggers.c @@ -201,6 +201,12 @@ int led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig) */ synchronize_rcu(); + /* + * If "set brightness to 0" is pending in workqueue, + * we don't want that to be reordered after ->activate() + */ + flush_work(&led_cdev->set_brightness_work); + ret = 0; if (trig->activate) ret = trig->activate(led_cdev); |