diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-16 05:28:25 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-16 05:28:25 +0300 |
| commit | 2dbfca5a181973558277b28b1f4c36362291f5e0 (patch) | |
| tree | e9d217adf53e3532939e7a3c3bcec94afd671306 /drivers/leds/trigger/ledtrig-gpio.c | |
| parent | dab363f938a53ddaee60bfecc1aebdbb3d3af5f0 (diff) | |
| parent | 2969bb18f8895eb4e0fbbc98efe706f15a3acff5 (diff) | |
| download | linux-2dbfca5a181973558277b28b1f4c36362291f5e0.tar.xz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
Pull LED subsystem update from Bryan Wu:
"We got some cleanup and driver for LP8860 as well as some patches for
LED Flash Class"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
leds: lp8860: Fix module dependency
leds: lp8860: Introduce TI lp8860 4 channel LED driver
leds: Add support for setting brightness in a synchronous way
leds: implement sysfs interface locking mechanism
leds: syscon: handle multiple syscon instances
leds: delete copy/paste mistake
leds: regulator: Convert to devm_regulator_get_exclusive
Diffstat (limited to 'drivers/leds/trigger/ledtrig-gpio.c')
| -rw-r--r-- | drivers/leds/trigger/ledtrig-gpio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/leds/trigger/ledtrig-gpio.c b/drivers/leds/trigger/ledtrig-gpio.c index c86c41826476..4cc7040746c6 100644 --- a/drivers/leds/trigger/ledtrig-gpio.c +++ b/drivers/leds/trigger/ledtrig-gpio.c @@ -54,12 +54,12 @@ static void gpio_trig_work(struct work_struct *work) if (tmp) { if (gpio_data->desired_brightness) - __led_set_brightness(gpio_data->led, + led_set_brightness_async(gpio_data->led, gpio_data->desired_brightness); else - __led_set_brightness(gpio_data->led, LED_FULL); + led_set_brightness_async(gpio_data->led, LED_FULL); } else { - __led_set_brightness(gpio_data->led, LED_OFF); + led_set_brightness_async(gpio_data->led, LED_OFF); } } |