lkml.org 
[lkml]   [2011]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[14/26] Revert "leds: save the delay values after a successful call to blink_set()"
    3.1-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <jhovold@gmail.com>

    commit cb871513f656bdfc48b185b55f37857b5c750c40 upstream.

    Revert commit 6123b0e274503a0d3588e84fbe07c9aa01bfaf5d.

    The problem this patch intends to solve has alreadqy been fixed by
    commit 7a5caabd090b ("drivers/leds/ledtrig-timer.c: fix broken sysfs
    delay handling").

    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Cc: Antonio Ospite <ospite@studenti.unina.it>
    Cc: Johannes Berg <johannes@sipsolutions.net>
    Cc: Richard Purdie <rpurdie@rpsys.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/leds/led-class.c | 5 +----
    1 file changed, 1 insertion(+), 4 deletions(-)

    --- a/drivers/leds/led-class.c
    +++ b/drivers/leds/led-class.c
    @@ -270,11 +270,8 @@ void led_blink_set(struct led_classdev *
    del_timer_sync(&led_cdev->blink_timer);

    if (led_cdev->blink_set &&
    - !led_cdev->blink_set(led_cdev, delay_on, delay_off)) {
    - led_cdev->blink_delay_on = *delay_on;
    - led_cdev->blink_delay_off = *delay_off;
    + !led_cdev->blink_set(led_cdev, delay_on, delay_off))
    return;
    - }

    /* blink with 1 Hz as default if nothing specified */
    if (!*delay_on && !*delay_off)



    \
     
     \ /
      Last update: 2011-11-19 01:13    [W:0.024 / U:29.660 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site