From ba60d6bd37220e82bb19e6912d547d2a7a4486b3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 14 Sep 2024 14:36:47 +0000 Subject: [PATCH] Revert "leds: triggers: Flush pending brightness before activating trigger" This reverts commit 7118f979163db8066aa8411eb187d4cbebec60ab which is commit ab477b766edd3bfb6321a6e3df4c790612613fae upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I504fb7dbfa49fb2d1b79107fc35325b9d5bc399d Signed-off-by: Greg Kroah-Hartman --- drivers/leds/led-triggers.c | 6 ------ drivers/leds/trigger/ledtrig-timer.c | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c index 3d3673c197e3..fe7fb2e7149c 100644 --- a/drivers/leds/led-triggers.c +++ b/drivers/leds/led-triggers.c @@ -200,12 +200,6 @@ 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); diff --git a/drivers/leds/trigger/ledtrig-timer.c b/drivers/leds/trigger/ledtrig-timer.c index 1d213c999d40..b4688d1d9d2b 100644 --- a/drivers/leds/trigger/ledtrig-timer.c +++ b/drivers/leds/trigger/ledtrig-timer.c @@ -110,6 +110,11 @@ static int timer_trig_activate(struct led_classdev *led_cdev) led_cdev->flags &= ~LED_INIT_DEFAULT_TRIGGER; } + /* + * If "set brightness to 0" is pending in workqueue, we don't + * want that to be reordered after blink_set() + */ + flush_work(&led_cdev->set_brightness_work); led_blink_set(led_cdev, &led_cdev->blink_delay_on, &led_cdev->blink_delay_off);