[PATCH] leds: ledtrig-transient: fix duration to be msec instead of jiffies

[PATCH] leds: ledtrig-transient: fix duration to be msec instead of jiffies

[Rob Herring]

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: Jacek Anaszewski <j.anaszewski@samsung.com>
Cc: linux-leds@vger.kernel.org
---
 drivers/leds/trigger/ledtrig-transient.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/leds/trigger/ledtrig-transient.c b/drivers/leds/trigger/ledtrig-transient.c
index 3c34de4..60034bf 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
-- 
2.5.0

Re: [PATCH] leds: ledtrig-transient: fix duration to be msec instead of jiffies

[Jacek Anaszewski]

Hi Rob,

On 11/11/2015 12:10 AM, Rob Herring wrote:
> 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: Jacek Anaszewski <j.anaszewski@samsung.com>
> Cc: linux-leds@vger.kernel.org
> ---
>   drivers/leds/trigger/ledtrig-transient.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/leds/trigger/ledtrig-transient.c b/drivers/leds/trigger/ledtrig-transient.c
> index 3c34de4..60034bf 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
>

Applied, thanks.

-- 
Best Regards,
Jacek Anaszewski