summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJacek Anaszewski <j.anaszewski@samsung.com>2016-04-18 16:09:55 +0200
committerJacek Anaszewski <j.anaszewski@samsung.com>2016-04-19 08:57:16 +0200
commitcf6fea8cda8ae3b5b7576fa6bd2b35905e155967 (patch)
tree902cb0c38640d6fde8b18fa19a52d26b29141299 /drivers
parent4a91c45ea57c4974c797b89dfed19e946a774787 (diff)
downloadlinux-cf6fea8cda8ae3b5b7576fa6bd2b35905e155967.tar.gz
linux-cf6fea8cda8ae3b5b7576fa6bd2b35905e155967.tar.bz2
linux-cf6fea8cda8ae3b5b7576fa6bd2b35905e155967.zip
leds: ledtrig-ide-disk: Move ide_blink_delay to ledtrig_ide_activity()
Parameters delay_on and delay_off of led_trigger_blink_oneshot() are pointers, to enable blink interval adjustment by LED class drivers of the controllers that implement hardware blinking. Move ide_blink_delay variable to ledtrig_ide_activity() in order to prevent the situation when adjustment committed by one LED class driver influences blink interval of the software fallback blink feature, that is applied to the drivers that don't implement blink_set op. Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/leds/trigger/ledtrig-ide-disk.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/leds/trigger/ledtrig-ide-disk.c b/drivers/leds/trigger/ledtrig-ide-disk.c
index c02a3ac3cd2b..15123d389240 100644
--- a/drivers/leds/trigger/ledtrig-ide-disk.c
+++ b/drivers/leds/trigger/ledtrig-ide-disk.c
@@ -18,10 +18,11 @@
#define BLINK_DELAY 30
DEFINE_LED_TRIGGER(ledtrig_ide);
-static unsigned long ide_blink_delay = BLINK_DELAY;
void ledtrig_ide_activity(void)
{
+ unsigned long ide_blink_delay = BLINK_DELAY;
+
led_trigger_blink_oneshot(ledtrig_ide,
&ide_blink_delay, &ide_blink_delay, 0);
}