---

yaml --- r: 272211 b: refs/heads/master c: 6123b0e h: refs/heads/master i: 272209: 4b484bf 272207: 4836d58 v: v3
git-mirror · Nov 1, 2011 · 946bd9c · 946bd9c
1 parent c647d4e
commit 946bd9c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dabc69c24271bd6ac126e3dda4f2d72234da81df
+refs/heads/master: 6123b0e274503a0d3588e84fbe07c9aa01bfaf5d
diff --git a/trunk/drivers/leds/led-class.c b/trunk/drivers/leds/led-class.c
@@ -268,8 +268,11 @@ void led_blink_set(struct led_classdev *led_cdev,
 		   unsigned long *delay_off)
 {
 	if (led_cdev->blink_set &&
-	    !led_cdev->blink_set(led_cdev, delay_on, delay_off))
+	    !led_cdev->blink_set(led_cdev, delay_on, delay_off)) {
+		led_cdev->blink_delay_on = *delay_on;
+		led_cdev->blink_delay_off = *delay_off;
 		return;
+	}
 
 	/* blink with 1 Hz as default if nothing specified */
 	if (!*delay_on && !*delay_off)