Skip to content

Commit

Permalink
leds: ledtrig-transient: fix duration to be msec instead of jiffies
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rob Herring authored and Jacek Anaszewski committed Jan 4, 2016
1 parent df8ff5d commit 22f933a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/leds/trigger/ledtrig-transient.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 22f933a

Please sign in to comment.