releases/3.18.103/revert-led-core-fix-brightness-setting-when-setting-delay_off-0.patch

   1 From 3f3437fbb2d8f780e84f507282d03facb4ccf248 Mon Sep 17 00:00:00 2001
   2 From: Ben Hutchings <ben.hutchings@codethink.co.uk>
   3 Date: Thu, 8 Mar 2018 15:59:07 +0000
   4 Subject: Revert "led: core: Fix brightness setting when setting delay_off=0"
   5
   6 From: Ben Hutchings <ben.hutchings@codethink.co.uk>
   7
   8 This reverts commit 20f6d9c2af33da892a0e03ffd6249c7ab81edfb7, which
   9 was commit 2b83ff96f51d0b039c4561b9f95c824d7bddb85c upstream.
  10 The bug that it should fix was only introduced in Linux 4.7, and
  11 in 4.4 it causes a regression.
  12
  13 Reported-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
  14 Cc: Matthieu CASTET <matthieu.castet@parrot.com>
  15 Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
  16 Cc: Wang Han <wanghan1995315@gmail.com>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18
  19 ---
  20  drivers/leds/led-core.c |    2 +-
  21  1 file changed, 1 insertion(+), 1 deletion(-)
  22
  23 --- a/drivers/leds/led-core.c
  24 +++ b/drivers/leds/led-core.c
  25 @@ -76,7 +76,7 @@ void led_blink_set(struct led_classdev *
  26                    unsigned long *delay_on,
  27                    unsigned long *delay_off)
  28  {
  29 -       led_stop_software_blink(led_cdev);
  30 +       del_timer_sync(&led_cdev->blink_timer);
  31
  32         led_cdev->flags &= ~LED_BLINK_ONESHOT;
  33         led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP;