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

Commit f58c356e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'led-fixes-for-5.2-rc3' of... 

Merge tag 'led-fixes-for-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds

Pull LED fix from Jacek Anaszewski:
 "Fix for a recent change in LED core, that didn't take into account the
  possibility of calling led_blink_setup() from atomic context"

* tag 'led-fixes-for-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
  leds: avoid flush_work in atomic context
parents 9221dced 8c0f693c

drivers/leds/led-core.c

+0 −5
Original line number Diff line number Diff line
@@ -164,11 +164,6 @@ static void led_blink_setup(struct led_classdev *led_cdev, 
		     unsigned long *delay_on,

		     unsigned long *delay_off)

{

	/*

	 * If "set brightness to 0" is pending in workqueue, we don't

	 * want that to be reordered after blink_set()

	 */

	flush_work(&led_cdev->set_brightness_work);

	if (!test_bit(LED_BLINK_ONESHOT, &led_cdev->work_flags) &&

	    led_cdev->blink_set &&

	    !led_cdev->blink_set(led_cdev, delay_on, delay_off))

drivers/leds/trigger/ledtrig-timer.c

+5 −0
Original line number Diff line number Diff line
@@ -113,6 +113,11 @@ static int timer_trig_activate(struct led_classdev *led_cdev) 
		led_cdev->flags &= ~LED_INIT_DEFAULT_TRIGGER;

	}



	/*

	 * If "set brightness to 0" is pending in workqueue, we don't

	 * want that to be reordered after blink_set()

	 */

	flush_work(&led_cdev->set_brightness_work);

	led_blink_set(led_cdev, &led_cdev->blink_delay_on,

		      &led_cdev->blink_delay_off);