diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
| commit | f499cae1e59d75d5eb24c23d47cf8986e6032c6d (patch) | |
| tree | 1af6235c18391212c40116eb90b01eae8938efee /drivers/leds/ledtrig-heartbeat.c | |
| parent | fc3f55e672e1ed917dd9e215af81939cd3d717da (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/leds/ledtrig-heartbeat.c')
| -rw-r--r-- | drivers/leds/ledtrig-heartbeat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/leds/ledtrig-heartbeat.c b/drivers/leds/ledtrig-heartbeat.c index 4bf8cec8b8c1..c1c1ea6f817b 100644 --- a/drivers/leds/ledtrig-heartbeat.c +++ b/drivers/leds/ledtrig-heartbeat.c | |||
| @@ -47,7 +47,7 @@ static void led_heartbeat_function(unsigned long data) | |||
| 47 | msecs_to_jiffies(heartbeat_data->period); | 47 | msecs_to_jiffies(heartbeat_data->period); |
| 48 | delay = msecs_to_jiffies(70); | 48 | delay = msecs_to_jiffies(70); |
| 49 | heartbeat_data->phase++; | 49 | heartbeat_data->phase++; |
| 50 | brightness = LED_FULL; | 50 | brightness = led_cdev->max_brightness; |
| 51 | break; | 51 | break; |
| 52 | case 1: | 52 | case 1: |
| 53 | delay = heartbeat_data->period / 4 - msecs_to_jiffies(70); | 53 | delay = heartbeat_data->period / 4 - msecs_to_jiffies(70); |
| @@ -56,7 +56,7 @@ static void led_heartbeat_function(unsigned long data) | |||
| 56 | case 2: | 56 | case 2: |
| 57 | delay = msecs_to_jiffies(70); | 57 | delay = msecs_to_jiffies(70); |
| 58 | heartbeat_data->phase++; | 58 | heartbeat_data->phase++; |
| 59 | brightness = LED_FULL; | 59 | brightness = led_cdev->max_brightness; |
| 60 | break; | 60 | break; |
| 61 | default: | 61 | default: |
| 62 | delay = heartbeat_data->period - heartbeat_data->period / 4 - | 62 | delay = heartbeat_data->period - heartbeat_data->period / 4 - |