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://

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://
  leds: core: Fix regression caused by commit 2b83ff96
parents c11a5fe6 7b6af2c5
......@@ -186,8 +186,9 @@ void led_blink_set(struct led_classdev *led_cdev,
unsigned long *delay_on,
unsigned long *delay_off)
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);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment