Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f2382f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'led_fixes_for_4.15-rc6' of... 

Merge tag 'led_fixes_for_4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds

Pull LED fix from Jacek Anaszewski:
 "A single LED fix for brightness setting when delay_off is 0"

* tag 'led_fixes_for_4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
  led: core: Fix brightness setting when setting delay_off=0
parents 19286e4a 2b83ff96

drivers/leds/led-core.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ void led_blink_set(struct led_classdev *led_cdev, 
		   unsigned long *delay_on,

		   unsigned long *delay_off)

{

	del_timer_sync(&led_cdev->blink_timer);

	led_stop_software_blink(led_cdev);



	clear_bit(LED_BLINK_ONESHOT, &led_cdev->work_flags);

	clear_bit(LED_BLINK_ONESHOT_STOP, &led_cdev->work_flags);