summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-07 10:58:19 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-07 10:58:19 -0800
commitbbce0b5ca2884b44dbfffff77e876a90b4184516 (patch)
tree5d2caf13e0f8a7b8e3764f31c29f102c7964adc9 /include
parent5fa2e1591300267b1e082c693d0b4da8e4943551 (diff)
parentdc47206e552c0850ad11f7e9a1fca0a3c92f5d65 (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 'include')
-rw-r--r--include/linux/leds.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/leds.h b/include/linux/leds.h
index dc1178f6184b..b4130ff58d0c 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -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;