From 45f7cf617213818488c287649e1e6370a1ba2f9e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 20 Oct 2008 23:16:17 +0100 Subject: [PATCH] --- yaml --- r: 117749 b: refs/heads/master c: 270c3957dbc5bedf093dc864840be0cc6dbda1f6 h: refs/heads/master i: 117747: 10a3e790a7f2ebfe0dba4152204cb60e599a120a v: v3 --- [refs] | 2 +- trunk/drivers/leds/led-class.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 77056a20fa90..778d66508283 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0266a45896a53b1261e9657aa3fbf9ca3d2fd07b +refs/heads/master: 270c3957dbc5bedf093dc864840be0cc6dbda1f6 diff --git a/trunk/drivers/leds/led-class.c b/trunk/drivers/leds/led-class.c index 5db86c29fe61..6c4a326176d7 100644 --- a/trunk/drivers/leds/led-class.c +++ b/trunk/drivers/leds/led-class.c @@ -110,6 +110,9 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev) if (rc) goto err_out; +#ifdef CONFIG_LEDS_TRIGGERS + init_rwsem(&led_cdev->trigger_lock); +#endif /* add to the list of leds */ down_write(&leds_list_lock); list_add_tail(&led_cdev->node, &leds_list); @@ -118,8 +121,6 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev) led_update_brightness(led_cdev); #ifdef CONFIG_LEDS_TRIGGERS - init_rwsem(&led_cdev->trigger_lock); - rc = device_create_file(led_cdev->dev, &dev_attr_trigger); if (rc) goto err_out_led_list;