* [PATCH 4.9 0/2] Clear LED_BLINK_SW flag in led_blink_set()
@ 2018-03-17 7:31 Jacek Anaszewski
2018-03-17 7:31 ` [PATCH 4.9 1/2] Revert "led: core: Fix brightness setting when setting delay_off=0" Jacek Anaszewski
2018-03-17 7:31 ` [PATCH 4.9 2/2] led: core: Clear LED_BLINK_SW flag in led_blink_set() Jacek Anaszewski
0 siblings, 2 replies; 5+ messages in thread
From: Jacek Anaszewski @ 2018-03-17 7:31 UTC (permalink / raw)
To: stable, gregkh; +Cc: linux-kernel, pavel, jacek.anaszewski
The fix for brightness setting when setting delay_off=0 introduces
a regression and has truncated commit message. Revert that patch
and apply the one-line change required to fix the original issue
in the way appropriate for the 4.9 code base.
Thanks,
Jacek Anaszewski
Jacek Anaszewski (2):
Revert "led: core: Fix brightness setting when setting delay_off=0"
led: core: Clear LED_BLINK_SW flag in led_blink_set()
drivers/leds/led-core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
2.1.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 4.9 1/2] Revert "led: core: Fix brightness setting when setting delay_off=0"
2018-03-17 7:31 [PATCH 4.9 0/2] Clear LED_BLINK_SW flag in led_blink_set() Jacek Anaszewski
@ 2018-03-17 7:31 ` Jacek Anaszewski
2018-03-19 13:37 ` Greg KH
2018-03-17 7:31 ` [PATCH 4.9 2/2] led: core: Clear LED_BLINK_SW flag in led_blink_set() Jacek Anaszewski
1 sibling, 1 reply; 5+ messages in thread
From: Jacek Anaszewski @ 2018-03-17 7:31 UTC (permalink / raw)
To: stable, gregkh; +Cc: linux-kernel, pavel, jacek.anaszewski
This reverts commit 86b9fa2190907f4f550d9d6bf490c5f89ca33836.
The commit being reverted has two flaws:
- it introduces a regression, fixed in the upstream
commit 7b6af2c53192f1766892ef40c8f48a413509ed72.
- it has truncated commit message
---
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 d70d4a5..3bce448 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.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4.9 2/2] led: core: Clear LED_BLINK_SW flag in led_blink_set()
2018-03-17 7:31 [PATCH 4.9 0/2] Clear LED_BLINK_SW flag in led_blink_set() Jacek Anaszewski
2018-03-17 7:31 ` [PATCH 4.9 1/2] Revert "led: core: Fix brightness setting when setting delay_off=0" Jacek Anaszewski
@ 2018-03-17 7:31 ` Jacek Anaszewski
1 sibling, 0 replies; 5+ messages in thread
From: Jacek Anaszewski @ 2018-03-17 7:31 UTC (permalink / raw)
To: stable, gregkh; +Cc: linux-kernel, pavel, jacek.anaszewski, Matthieu CASTET
With the current code, the following sequence won't work :
echo timer > trigger
echo 0 > delay_off
* at this point we call
** led_delay_off_store
** led_blink_set
*** stop timer
** led_blink_setup
** led_set_software_blink
*** if !delay_on, led off
*** if !delay_off, set led_set_brightness_nosleep <--- LED_BLINK_SW
is set but timer is stop
*** otherwise start timer/set LED_BLINK_SW flag
echo xxx > brightness
* led_set_brightness
** if LED_BLINK_SW
*** if brightness=0, led off
*** else apply brightness if next timer <--- timer is stop, and will
never apply new setting
** otherwise set led_set_brightness_nosleep
To fix that, when we delete the timer, we should clear LED_BLINK_SW.
Signed-off-by: Matthieu CASTET <matthieu.castet@parrot.com>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
---
drivers/leds/led-core.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index 3bce448..454ed4d 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -188,6 +188,7 @@ void led_blink_set(struct led_classdev *led_cdev,
{
del_timer_sync(&led_cdev->blink_timer);
+ led_cdev->flags &= ~LED_BLINK_SW;
led_cdev->flags &= ~LED_BLINK_ONESHOT;
led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP;
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 4.9 1/2] Revert "led: core: Fix brightness setting when setting delay_off=0"
2018-03-17 7:31 ` [PATCH 4.9 1/2] Revert "led: core: Fix brightness setting when setting delay_off=0" Jacek Anaszewski
@ 2018-03-19 13:37 ` Greg KH
2018-03-19 19:29 ` Jacek Anaszewski
0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2018-03-19 13:37 UTC (permalink / raw)
To: Jacek Anaszewski; +Cc: stable, linux-kernel, pavel
On Sat, Mar 17, 2018 at 08:31:01AM +0100, Jacek Anaszewski wrote:
> This reverts commit 86b9fa2190907f4f550d9d6bf490c5f89ca33836.
>
> The commit being reverted has two flaws:
> - it introduces a regression, fixed in the upstream
> commit 7b6af2c53192f1766892ef40c8f48a413509ed72.
> - it has truncated commit message
> ---
> drivers/leds/led-core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
I need a signed-off-by :(
And maybe a few "reported-by:" lines as well, that email thread seemed
to have lots of people on it...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 4.9 1/2] Revert "led: core: Fix brightness setting when setting delay_off=0"
2018-03-19 13:37 ` Greg KH
@ 2018-03-19 19:29 ` Jacek Anaszewski
0 siblings, 0 replies; 5+ messages in thread
From: Jacek Anaszewski @ 2018-03-19 19:29 UTC (permalink / raw)
To: Greg KH; +Cc: stable, linux-kernel, pavel
On 03/19/2018 02:37 PM, Greg KH wrote:
> On Sat, Mar 17, 2018 at 08:31:01AM +0100, Jacek Anaszewski wrote:
>> This reverts commit 86b9fa2190907f4f550d9d6bf490c5f89ca33836.
>>
>> The commit being reverted has two flaws:
>> - it introduces a regression, fixed in the upstream
>> commit 7b6af2c53192f1766892ef40c8f48a413509ed72.
>> - it has truncated commit message
>> ---
>> drivers/leds/led-core.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> I need a signed-off-by :(
>
> And maybe a few "reported-by:" lines as well, that email thread seemed
> to have lots of people on it...
I've just sent v2.
--
Best regards,
Jacek Anaszewski
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-19 19:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-17 7:31 [PATCH 4.9 0/2] Clear LED_BLINK_SW flag in led_blink_set() Jacek Anaszewski
2018-03-17 7:31 ` [PATCH 4.9 1/2] Revert "led: core: Fix brightness setting when setting delay_off=0" Jacek Anaszewski
2018-03-19 13:37 ` Greg KH
2018-03-19 19:29 ` Jacek Anaszewski
2018-03-17 7:31 ` [PATCH 4.9 2/2] led: core: Clear LED_BLINK_SW flag in led_blink_set() Jacek Anaszewski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).