From 96288dc139129b8b70a8418ee3c97de93b0b5198 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 17 Mar 2018 17:01:01 +0100 Subject: [PATCH] generic: revert broken LED core patch The patch breaks LED operation and has already been reverted in 4.4.121. 4.9.87 is still affected; revert it locally until the issue is sorted out upstream. Signed-off-by: Matthias Schiffer --- ...Fix-brightness-setting-when-setting-.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 target/linux/generic/pending-4.9/210-Revert-led-core-Fix-brightness-setting-when-setting-.patch diff --git a/target/linux/generic/pending-4.9/210-Revert-led-core-Fix-brightness-setting-when-setting-.patch b/target/linux/generic/pending-4.9/210-Revert-led-core-Fix-brightness-setting-when-setting-.patch new file mode 100644 index 0000000000..df23bb3db8 --- /dev/null +++ b/target/linux/generic/pending-4.9/210-Revert-led-core-Fix-brightness-setting-when-setting-.patch @@ -0,0 +1,26 @@ +From: Matthias Schiffer +Date: Sat, 17 Mar 2018 16:53:21 +0100 +Subject: [PATCH] Revert "led: core: Fix brightness setting when setting + delay_off=0" + +This reverts commit 86b9fa2190907f4f550d9d6bf490c5f89ca33836. +--- + drivers/leds/led-core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c +index d70d4a5273b8..3bce44893021 100644 +--- a/drivers/leds/led-core.c ++++ b/drivers/leds/led-core.c +@@ -186,7 +186,7 @@ void led_blink_set(struct led_classdev *led_cdev, + 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; +-- +2.16.2 + -- 2.30.2