Commit 82f80ef5 authored by Hans de Goede's avatar Hans de Goede Committed by Lee Jones
Browse files

leds: Clear LED_INIT_DEFAULT_TRIGGER when clearing current trigger 



Not all triggers use LED_INIT_DEFAULT_TRIGGER, which means that it
will not get cleared when the default trigger is a trigger which
does not use it such as "default-on".

If the default trigger then later gets replaced by a trigger which
does check LED_INIT_DEFAULT_TRIGGER, such as "timer" then that trigger
will behave as if it is the default trigger which it should not do.

To fix this clear the LED_INIT_DEFAULT_TRIGGER flag when clearing
the current trigger, so that it will not be set for any subsequently
set (non default) triggers.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
Tested-by: default avatarYauhen Kharuzhy <jekhor@gmail.com>
Link: https://lore.kernel.org/r/20230510162234.291439-5-hdegoede@redhat.com


Signed-off-by: default avatarLee Jones <lee@kernel.org>
parent 22720a87

drivers/leds/led-triggers.c

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ int led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig) 
		led_cdev->trigger = NULL;

		led_cdev->trigger_data = NULL;

		led_cdev->activated = false;

		led_cdev->flags &= ~LED_INIT_DEFAULT_TRIGGER;

		led_set_brightness(led_cdev, LED_OFF);

	}

	if (trig) {