diff options
| author | Johan Hovold <jhovold@gmail.com> | 2011-09-14 16:22:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:40:31 -0700 |
| commit | d9575b0bf2b1c380bde6803739513ccc1f95d1d0 (patch) | |
| tree | fb7daac152d75b0c47545cae987930cff8d7f3c2 /drivers/leds | |
| parent | d63c8a029e509ad48ee9290874731789f9008537 (diff) | |
| download | kernel_samsung_smdk4412-d9575b0bf2b1c380bde6803739513ccc1f95d1d0.tar.gz kernel_samsung_smdk4412-d9575b0bf2b1c380bde6803739513ccc1f95d1d0.tar.bz2 kernel_samsung_smdk4412-d9575b0bf2b1c380bde6803739513ccc1f95d1d0.zip | |
drivers/leds/ledtrig-timer.c: fix broken sysfs delay handling
commit 7a5caabd090b8f7d782c40fc1c048d798f2b6fd7 upstream.
Fix regression introduced by commit 5ada28bf7675 ("led-class: always
implement blinking") which broke sysfs delay handling by not storing the
updated value. Consequently it was only possible to set one of the delays
through the sysfs interface as the other delay was automatically restored
to it's default value. Reading the parameters always gave the defaults.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Acked-by: Florian Fainelli <florian@openwrt.org>
Acked-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/ledtrig-timer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/ledtrig-timer.c index d87c9d02f78..328c64c0841 100644 --- a/drivers/leds/ledtrig-timer.c +++ b/drivers/leds/ledtrig-timer.c @@ -41,6 +41,7 @@ static ssize_t led_delay_on_store(struct device *dev, if (count == size) { led_blink_set(led_cdev, &state, &led_cdev->blink_delay_off); + led_cdev->blink_delay_on = state; ret = count; } @@ -69,6 +70,7 @@ static ssize_t led_delay_off_store(struct device *dev, if (count == size) { led_blink_set(led_cdev, &led_cdev->blink_delay_on, &state); + led_cdev->blink_delay_off = state; ret = count; } |