Commit d9575b0b authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

drivers/leds/ledtrig-timer.c: fix broken sysfs delay handling

commit 7a5caabd upstream.

Fix regression introduced by commit 5ada28bf ("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: default avatarJohan Hovold <jhovold@gmail.com>
Acked-by: default avatarFlorian Fainelli <florian@openwrt.org>
Acked-by: default avatarRichard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d63c8a02
...@@ -41,6 +41,7 @@ static ssize_t led_delay_on_store(struct device *dev, ...@@ -41,6 +41,7 @@ static ssize_t led_delay_on_store(struct device *dev,
if (count == size) { if (count == size) {
led_blink_set(led_cdev, &state, &led_cdev->blink_delay_off); led_blink_set(led_cdev, &state, &led_cdev->blink_delay_off);
led_cdev->blink_delay_on = state;
ret = count; ret = count;
} }
...@@ -69,6 +70,7 @@ static ssize_t led_delay_off_store(struct device *dev, ...@@ -69,6 +70,7 @@ static ssize_t led_delay_off_store(struct device *dev,
if (count == size) { if (count == size) {
led_blink_set(led_cdev, &led_cdev->blink_delay_on, &state); led_blink_set(led_cdev, &led_cdev->blink_delay_on, &state);
led_cdev->blink_delay_off = state;
ret = count; ret = count;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment