diff options
| -rw-r--r-- | drivers/leds/led-triggers.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c index f910eaffe3a6..520d1afda1cc 100644 --- a/drivers/leds/led-triggers.c +++ b/drivers/leds/led-triggers.c @@ -143,8 +143,10 @@ void led_trigger_set_default(struct led_classdev *led_cdev) down_read(&triggers_list_lock); down_write(&led_cdev->trigger_lock); list_for_each_entry(trig, &trigger_list, next_trig) { - if (!strcmp(led_cdev->default_trigger, trig->name)) + if (!strcmp(led_cdev->default_trigger, trig->name)) { led_trigger_set(led_cdev, trig); + break; + } } up_write(&led_cdev->trigger_lock); up_read(&triggers_list_lock); @@ -156,12 +158,24 @@ EXPORT_SYMBOL_GPL(led_trigger_set_default); int led_trigger_register(struct led_trigger *trigger) { struct led_classdev *led_cdev; + struct led_trigger *ltrigger; rwlock_init(&trigger->leddev_list_lock); INIT_LIST_HEAD(&trigger->led_cdevs); + /* Reject the special none trigger */ + if (!strcmp(trigger->name, "none")) + return -EINVAL; + /* Add to the list of led triggers */ down_write(&triggers_list_lock); + list_for_each_entry(ltrigger, &trigger_list, next_trig) { + if (!strcmp(trigger->name, ltrigger->name)) { + up_write(&triggers_list_lock); + + return -EEXIST; + } + } list_add_tail(&trigger->next_trig, &trigger_list); up_write(&triggers_list_lock); |