| From ben.hutchings@codethink.co.uk Thu Mar 8 09:31:04 2018 |
| From: Ben Hutchings <ben.hutchings@codethink.co.uk> |
| Date: Thu, 8 Mar 2018 15:59:07 +0000 |
| Subject: Revert "led: core: Fix brightness setting when setting delay_off=0" |
| To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Cc: Jacek Anaszewski <jacek.anaszewski@gmail.com>, Matthieu CASTET <matthieu.castet@parrot.com>, stable@vger.kernel.org |
| Message-ID: <20180308155906.5zaldlnuxvxmh2wo@xylophone.i.decadent.org.uk> |
| Content-Disposition: inline |
| |
| From: Ben Hutchings <ben.hutchings@codethink.co.uk> |
| |
| This reverts commit 20ac8f72514b3af8b62c520d55656ded865eff00, which |
| was commit 2b83ff96f51d0b039c4561b9f95c824d7bddb85c upstream. |
| The bug that it should fix was only introduced in Linux 4.7, and |
| in 4.4 it causes a regression. |
| |
| Reported-by: Jacek Anaszewski <jacek.anaszewski@gmail.com> |
| Cc: Matthieu CASTET <matthieu.castet@parrot.com> |
| Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/leds/led-core.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/leds/led-core.c |
| +++ b/drivers/leds/led-core.c |
| @@ -149,7 +149,7 @@ void led_blink_set(struct led_classdev * |
| unsigned long *delay_on, |
| unsigned long *delay_off) |
| { |
| - led_stop_software_blink(led_cdev); |
| + del_timer_sync(&led_cdev->blink_timer); |
| |
| led_cdev->flags &= ~LED_BLINK_ONESHOT; |
| led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP; |
