2 files changed, 6 insertions, 0 deletions

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 3c7e3487b373..85848c5da705 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -57,6 +57,7 @@ static ssize_t brightness_store(struct device *dev,
         if (state == LED_OFF)
                 led_trigger_remove(led_cdev);
         led_set_brightness(led_cdev, state);
+        flush_work(&led_cdev->set_brightness_work);
 
         ret = size;
 unlock:
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index e3da7c03da1b..e9ae7f87ab90 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -164,6 +164,11 @@ 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))