Skip to contentSkip to conversation

leds: ledtrig-timer: fix broken sysfs delay handling

PATCH In review Johan Hovold 4 participants 5 messages Sep 5, 2011 – Sep 7, 2011 LED

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 leds: ledtrig-timer: fix broken sysfs delay handling

Fix regression introduced by commit 5ada28bf76752e33dce3d807bf0dfbe6d1b943ad (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.

---
 drivers/leds/ledtrig-timer.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/leds/ledtrig-timer.c +2 -0
index d87c9d0..328c64c 100644
@@ -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;
 	}
 
Signature · 1 line
1.7.6
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · On Monday 05 September 2011 17:33:03 Johan Hovold wrote:

Fix regression introduced by commit 5ada28bf76752e33dce3d807bf0dfbe6d1b943ad (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.

Quoted 23 lines
---
 drivers/leds/ledtrig-timer.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/leds/ledtrig-timer.c +2 -0
index d87c9d0..328c64c 100644
@@ -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;
 	}
Signature · 1 line
Florian
#2 lore raw
Quoted 9 lines · Florian Fainelli
Quoted 8 lines · On Monday 05 September 2011 17:33:03 Johan Hovold wrote:

Fix regression introduced by commit 5ada28bf76752e33dce3d807bf0dfbe6d1b943ad (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.

Quoted 4 lines
Quoted 2 lines
Quoted 24 lines
Quoted 23 lines
---
 drivers/leds/ledtrig-timer.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/leds/ledtrig-timer.c +2 -0
index d87c9d0..328c64c 100644
@@ -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;
 	}