diff options
| author | Rob Herring <robh@kernel.org> | 2015-11-10 17:10:17 -0600 |
|---|---|---|
| committer | Jacek Anaszewski <j.anaszewski@samsung.com> | 2016-01-04 09:57:36 +0100 |
| commit | 22f933add429523923360e3d0c171c7df1bd4981 (patch) | |
| tree | 6bd78e4af20bf9699739691c4604224df7ba400e /drivers/leds | |
| parent | df8ff5d2e0f733aa6e866a6ba11a4c3376bb47f7 (diff) | |
| download | linux-stable-22f933add429523923360e3d0c171c7df1bd4981.tar.gz linux-stable-22f933add429523923360e3d0c171c7df1bd4981.tar.bz2 linux-stable-22f933add429523923360e3d0c171c7df1bd4981.zip | |
leds: ledtrig-transient: fix duration to be msec instead of jiffies
The transient trigger duration is documented to be in msec units, but is
actually in jiffies units. Other time based triggers are in msec units
as well. Fix the timer setup to convert from msec.
This could break an existing userspace that worked around this problem,
but exposing jiffies to userspace is just wrong and would break anyway
if HZ is changed.
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Shuah Khan <shuahkhan@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: linux-leds@vger.kernel.org
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/trigger/ledtrig-transient.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/leds/trigger/ledtrig-transient.c b/drivers/leds/trigger/ledtrig-transient.c index 1dddd8f63e2a..7e6011bd3646 100644 --- a/drivers/leds/trigger/ledtrig-transient.c +++ b/drivers/leds/trigger/ledtrig-transient.c @@ -85,7 +85,7 @@ static ssize_t transient_activate_store(struct device *dev, transient_data->restore_state = (transient_data->state == LED_FULL) ? LED_OFF : LED_FULL; mod_timer(&transient_data->timer, - jiffies + transient_data->duration); + jiffies + msecs_to_jiffies(transient_data->duration)); } /* state == 0 && transient_data->activate == 0 |