Merge tag 'ktest-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / drivers / leds / led-class.c

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index cc3929f..131ca83 100644 (file)
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -354,6 +354,11 @@ int led_classdev_register_ext(struct device *parent,
                ret = led_compose_name(parent, init_data, composed_name);
                if (ret < 0)
                        return ret;
+
+               if (init_data->fwnode)
+                       fwnode_property_read_string(init_data->fwnode,
+                               "linux,default-trigger",
+                               &led_cdev->default_trigger);
        } else {
                proposed_name = led_cdev->name;
        }