diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
tree | db28291df94a2043af2123911984c5c173da4e6f /drivers/leds/ledtrig-timer.c | |
parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/leds/ledtrig-timer.c')
-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 d87c9d02f786..328c64c0841c 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, | |||
41 | 41 | ||
42 | if (count == size) { | 42 | if (count == size) { |
43 | led_blink_set(led_cdev, &state, &led_cdev->blink_delay_off); | 43 | led_blink_set(led_cdev, &state, &led_cdev->blink_delay_off); |
44 | led_cdev->blink_delay_on = state; | ||
44 | ret = count; | 45 | ret = count; |
45 | } | 46 | } |
46 | 47 | ||
@@ -69,6 +70,7 @@ static ssize_t led_delay_off_store(struct device *dev, | |||
69 | 70 | ||
70 | if (count == size) { | 71 | if (count == size) { |
71 | led_blink_set(led_cdev, &led_cdev->blink_delay_on, &state); | 72 | led_blink_set(led_cdev, &led_cdev->blink_delay_on, &state); |
73 | led_cdev->blink_delay_off = state; | ||
72 | ret = count; | 74 | ret = count; |
73 | } | 75 | } |
74 | 76 | ||