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

Commit 9d61ec5b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull LED fix from Jacek Anaszewski:
 "The commit 2b83ff96 for 4.15-rc6, which was fixing LED brightness
  setting after clearing delay_off broke the behavior on any alteration
  of delay_on{off} properties, due to use of a LED core helper that does
  too much for this particular case"

* tag 'led_fixes_for_4.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
  leds: core: Fix regression caused by commit 2b83ff96
parents c11a5fe6 7b6af2c5

drivers/leds/led-core.c

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

		   unsigned long *delay_off)

{

	led_stop_software_blink(led_cdev);

	del_timer_sync(&led_cdev->blink_timer);



	clear_bit(LED_BLINK_SW, &led_cdev->work_flags);

	clear_bit(LED_BLINK_ONESHOT, &led_cdev->work_flags);

	clear_bit(LED_BLINK_ONESHOT_STOP, &led_cdev->work_flags);