Re: [PATCH 1/2] leds: save the delay values after a successful call to blink_set()

[Johannes Berg <johannes.berg@intel.com>]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 2373 bytes --]

On Thu, 2011-10-06 at 22:03 +0000, Antonio Ospite wrote:
> When calling the hardware blinking function implemented by blink_set(),
> the delay_on and delay_off values are not preserved across calls.
> 
> Fix that and make the "timer" trigger work as expected when hardware
> blinking is available.
> 
> BEFORE the fix:
>   $ cd /sys/class/leds/someled
>   $ echo timer > trigger
>   $ cat delay_on delay_off
>   0
>   0
>   $ echo 100 > delay_on
>   $ cat delay_on delay_off
>   0
>   0
>   $ echo 100 > delay_off
>   $ cat delay_on delay_off
>   0
>   0
> 
> AFTER the fix:
>   $ cd /sys/class/leds/someled
>   $ echo timer > trigger
>   $ cat delay_on delay_off
>   0
>   0
>   $ echo 100 > delay_on
>   $ cat delay_on delay_off
>   100
>   0
>   $ echo 100 > delay_off
>   $ cat delay_on delay_off
>   100
>   100
> 
> Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
> ---
>  drivers/leds/led-class.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
> index d5a4ade..939f24a 100644
> --- a/drivers/leds/led-class.c
> +++ b/drivers/leds/led-class.c
> @@ -267,8 +267,11 @@ void led_blink_set(struct led_classdev *led_cdev,
>                    unsigned long *delay_off)
>  {
>         if (led_cdev->blink_set &&
> -           !led_cdev->blink_set(led_cdev, delay_on, delay_off))
> +           !led_cdev->blink_set(led_cdev, delay_on, delay_off)) {
> +               led_cdev->blink_delay_on = *delay_on;
> +               led_cdev->blink_delay_off = *delay_off;
>                 return;
> +       }

Looks good to me. I suspect I created this bug because originally it
might have put the values into there first and then called blink_set().

Reviewed-by: Johannes Berg <johannes@sipsolutions.net>

johannes

--------------------------------------------------------------------------------------
Intel GmbH
Dornacher Strasse 1
85622 Feldkirchen/Muenchen, Deutschland 
Sitz der Gesellschaft: Feldkirchen bei Muenchen
Geschaeftsfuehrer: Douglas Lusk, Peter Gleissner, Hannes Schwaderer
Registergericht: Muenchen HRB 47456 
Ust.-IdNr./VAT Registration No.: DE129385895
Citibank Frankfurt a.M. (BLZ 502 109 00) 600119052
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥