Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 275475
b: refs/heads/master
c: cb87151
h: refs/heads/master
i:
  275473: d90f3db
  275471: 78d252f
v: v3
  • Loading branch information
Johan Hovold authored and Linus Torvalds committed Nov 16, 2011
1 parent d4eb7f6 commit c3a3162
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9f35a33b8d06263a165efe3541d9aa0cdbd70b3b
refs/heads/master: cb871513f656bdfc48b185b55f37857b5c750c40
5 changes: 1 addition & 4 deletions trunk/drivers/leds/led-class.c
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,8 @@ void led_blink_set(struct led_classdev *led_cdev,
del_timer_sync(&led_cdev->blink_timer);

if (led_cdev->blink_set &&
!led_cdev->blink_set(led_cdev, delay_on, delay_off)) {
led_cdev->blink_delay_on = *delay_on;
led_cdev->blink_delay_off = *delay_off;
!led_cdev->blink_set(led_cdev, delay_on, delay_off))
return;
}

/* blink with 1 Hz as default if nothing specified */
if (!*delay_on && !*delay_off)
Expand Down

0 comments on commit c3a3162

Please sign in to comment.