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
This commit is contained in:
Linus Torvalds
2007-12-07 10:58:19 -08:00
3 changed files with 30 additions and 28 deletions
+2 -1
View File
@@ -14,6 +14,7 @@
#include <linux/list.h>
#include <linux/spinlock.h>
#include <linux/rwsem.h>
struct device;
/*
@@ -43,7 +44,7 @@ struct led_classdev {
#ifdef CONFIG_LEDS_TRIGGERS
/* Protects the trigger data below */
rwlock_t trigger_lock;
struct rw_semaphore trigger_lock;
struct led_trigger *trigger;
struct list_head trig_list;