Trigger driver can be initialized after the LED class device driver.  In
such case led_trigger_set_default() won't be called and flag
LED_INIT_DEFAULT_TRIGGER should be set from led_trigger_register().

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
 drivers/leds/led-triggers.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index 9421222ca7a0..c67b044ae0af 100644
--- a/drivers/leds/led-triggers.c
+++ b/drivers/leds/led-triggers.c
@@ -252,8 +252,10 @@ int led_trigger_register(struct led_trigger *trig)
        list_for_each_entry(led_cdev, &leds_list, node) {
                down_write(&led_cdev->trigger_lock);
                if (!led_cdev->trigger && led_cdev->default_trigger &&
-                           !strcmp(led_cdev->default_trigger, trig->name))
+                           !strcmp(led_cdev->default_trigger, trig->name)) {
+                       led_cdev->flags |= LED_INIT_DEFAULT_TRIGGER;
                        led_trigger_set(led_cdev, trig);
+               }
                up_write(&led_cdev->trigger_lock);
        }
        up_read(&leds_list_lock);
-- 
2.7.4

Reply via email to