| From dd8722f44c82928aa183da17068ba83eb6fb99f7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 2 Jul 2020 13:45:00 +0800 |
| Subject: leds: core: Flush scheduled work for system suspend |
| |
| From: Kai-Heng Feng <kai.heng.feng@canonical.com> |
| |
| [ Upstream commit 302a085c20194bfa7df52e0fe684ee0c41da02e6 ] |
| |
| Sometimes LED won't be turned off by LED_CORE_SUSPENDRESUME flag upon |
| system suspend. |
| |
| led_set_brightness_nopm() uses schedule_work() to set LED brightness. |
| However, there's no guarantee that the scheduled work gets executed |
| because no one flushes the work. |
| |
| So flush the scheduled work to make sure LED gets turned off. |
| |
| Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> |
| Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com> |
| Fixes: 81fe8e5b73e3 ("leds: core: Add led_set_brightness_nosleep{nopm} functions") |
| Signed-off-by: Pavel Machek <pavel@ucw.cz> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/leds/led-class.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c |
| index 3363a6551a708..cc3929f858b68 100644 |
| --- a/drivers/leds/led-class.c |
| +++ b/drivers/leds/led-class.c |
| @@ -173,6 +173,7 @@ void led_classdev_suspend(struct led_classdev *led_cdev) |
| { |
| led_cdev->flags |= LED_SUSPENDED; |
| led_set_brightness_nopm(led_cdev, 0); |
| + flush_work(&led_cdev->set_brightness_work); |
| } |
| EXPORT_SYMBOL_GPL(led_classdev_suspend); |
| |
| -- |
| 2.25.1 |
| |
