projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'w90x900' into devel
[cascardo/linux.git]
/
drivers
/
leds
/
ledtrig-heartbeat.c
diff --git
a/drivers/leds/ledtrig-heartbeat.c
b/drivers/leds/ledtrig-heartbeat.c
index
4bf8cec
..
c1c1ea6
100644
(file)
--- a/
drivers/leds/ledtrig-heartbeat.c
+++ b/
drivers/leds/ledtrig-heartbeat.c
@@
-47,7
+47,7
@@
static void led_heartbeat_function(unsigned long data)
msecs_to_jiffies(heartbeat_data->period);
delay = msecs_to_jiffies(70);
heartbeat_data->phase++;
msecs_to_jiffies(heartbeat_data->period);
delay = msecs_to_jiffies(70);
heartbeat_data->phase++;
- brightness =
LED_FULL
;
+ brightness =
led_cdev->max_brightness
;
break;
case 1:
delay = heartbeat_data->period / 4 - msecs_to_jiffies(70);
break;
case 1:
delay = heartbeat_data->period / 4 - msecs_to_jiffies(70);
@@
-56,7
+56,7
@@
static void led_heartbeat_function(unsigned long data)
case 2:
delay = msecs_to_jiffies(70);
heartbeat_data->phase++;
case 2:
delay = msecs_to_jiffies(70);
heartbeat_data->phase++;
- brightness =
LED_FULL
;
+ brightness =
led_cdev->max_brightness
;
break;
default:
delay = heartbeat_data->period - heartbeat_data->period / 4 -
break;
default:
delay = heartbeat_data->period - heartbeat_data->period / 4 -