lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

leds: leds-ns2: fix locking

Browse Source 
This patch replace all the lock functions with the irq safe variant.
The ns2_led_{set,get}_mode() functions must be safe in all context.

For example, the trigger timer call led_set_brightness() in a softirq
context.

Signed-off-by: Simon Guinot <sguinot@lacie.com>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
This commit is contained in:
Simon Guinot
2010-09-19 15:30:59 +02:00
committed by Nicolas Pitre
parent c4a90588fa
commit f539dfedbd
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/leds/leds-ns2.c
View File

@@ -81,7 +81,7 @@ static int ns2_led_get_mode(struct ns2_led_data *led_dat,
int cmd_level; int cmd_level;
int slow_level; int slow_level;
read_lock(&led_dat->rw_lock); read_lock_irq(&led_dat->rw_lock);
cmd_level = gpio_get_value(led_dat->cmd); cmd_level = gpio_get_value(led_dat->cmd);
slow_level = gpio_get_value(led_dat->slow); slow_level = gpio_get_value(led_dat->slow);
@@ -95,7 +95,7 @@ static int ns2_led_get_mode(struct ns2_led_data *led_dat,
} }
} }
read_unlock(&led_dat->rw_lock); read_unlock_irq(&led_dat->rw_lock);
return ret; return ret;
} }
@@ -104,8 +104,9 @@ static void ns2_led_set_mode(struct ns2_led_data *led_dat,
enum ns2_led_modes mode) enum ns2_led_modes mode)
{ {
int i; int i;
unsigned long flags;
write_lock(&led_dat->rw_lock); write_lock_irqsave(&led_dat->rw_lock, flags);
for (i = 0; i < ARRAY_SIZE(ns2_led_modval); i++) { for (i = 0; i < ARRAY_SIZE(ns2_led_modval); i++) {
if (mode == ns2_led_modval[i].mode) { if (mode == ns2_led_modval[i].mode) {
@@ -116,7 +117,7 @@ static void ns2_led_set_mode(struct ns2_led_data *led_dat,
} }
} }
write_unlock(&led_dat->rw_lock); write_unlock_irqrestore(&led_dat->rw_lock, flags);
} }
static void ns2_led_set(struct led_classdev *led_cdev, static void ns2_led_set(struct led_classdev *led_cdev,