diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-07 10:58:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-07 10:58:19 -0800 |
| commit | bbce0b5ca2884b44dbfffff77e876a90b4184516 (patch) | |
| tree | 5d2caf13e0f8a7b8e3764f31c29f102c7964adc9 /drivers/leds/led-class.c | |
| parent | 5fa2e1591300267b1e082c693d0b4da8e4943551 (diff) | |
| parent | dc47206e552c0850ad11f7e9a1fca0a3c92f5d65 (diff) | |
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
leds: Fix led trigger locking bugs
Diffstat (limited to 'drivers/leds/led-class.c')
| -rw-r--r-- | drivers/leds/led-class.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index 4211293ce86..ba8b04b03b9 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c @@ -111,7 +111,7 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev) write_unlock(&leds_list_lock); #ifdef CONFIG_LEDS_TRIGGERS - rwlock_init(&led_cdev->trigger_lock); + init_rwsem(&led_cdev->trigger_lock); rc = device_create_file(led_cdev->dev, &dev_attr_trigger); if (rc) @@ -147,10 +147,10 @@ void led_classdev_unregister(struct led_classdev *led_cdev) device_remove_file(led_cdev->dev, &dev_attr_brightness); #ifdef CONFIG_LEDS_TRIGGERS device_remove_file(led_cdev->dev, &dev_attr_trigger); - write_lock(&led_cdev->trigger_lock); + down_write(&led_cdev->trigger_lock); if (led_cdev->trigger) led_trigger_set(led_cdev, NULL); - write_unlock(&led_cdev->trigger_lock); + up_write(&led_cdev->trigger_lock); #endif device_unregister(led_cdev->dev); |