aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/leds
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-10-27 15:03:56 -0700
committerColin Cross <ccross@android.com>2011-10-27 15:03:56 -0700
commit60988eca1376ba564e778007cbffabebf05599e1 (patch)
treea188cdd22dc3a9d42955679dc01357bcd0d7e264 /drivers/leds
parent47d998a7cec61a44b9e0799301039a63fed28280 (diff)
parentbc2e7067af4c1cd074aaec71c2982e2265f7f169 (diff)
downloadkernel_samsung_espresso10-60988eca1376ba564e778007cbffabebf05599e1.zip
kernel_samsung_espresso10-60988eca1376ba564e778007cbffabebf05599e1.tar.gz
kernel_samsung_espresso10-60988eca1376ba564e778007cbffabebf05599e1.tar.bz2
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'drivers/leds')
-rw-r--r--drivers/leds/ledtrig-timer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/ledtrig-timer.c
index d87c9d0..328c64c 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;
}