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

torvalds · torvalds · commit 9d61ec5baaf9 · 2018-01-07T11:01:59.000-08:00
Pull LED fix from Jacek Anaszewski: "The commit 2b83ff9 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 2b83ff9
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
@@ -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);
 

Original file line number	Diff line number	Diff line change
`@@ -186,8 +186,9 @@ void led_blink_set(struct led_classdev *led_cdev,`
`186`	`186`	`unsigned long *delay_on,`
`187`	`187`	`unsigned long *delay_off)`
`188`	`188`	`{`
`189`		`- led_stop_software_blink(led_cdev);`
	`189`	`+ del_timer_sync(&led_cdev->blink_timer);`
`190`	`190`
	`191`	`+ clear_bit(LED_BLINK_SW, &led_cdev->work_flags);`
`191`	`192`	`clear_bit(LED_BLINK_ONESHOT, &led_cdev->work_flags);`
`192`	`193`	`clear_bit(LED_BLINK_ONESHOT_STOP, &led_cdev->work_flags);`
`193`	`194`