aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-07-17 16:27:30 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-20 17:35:49 -0300
commitf7518bd2d9ecad8c404c300e7872f7c2ab4961ad (patch)
tree8143e30d8fc105ac9361ffc10066137c34c1f585
parent09df5cbe46511611410274f09571ada229231ddb (diff)
V4L/DVB (5859): use msecs_to_jiffies on InfraRed RC5 timeout
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/common/ir-functions.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/ir-functions.c b/drivers/media/common/ir-functions.c
index fe447a06e24..a3292e955aa 100644
--- a/drivers/media/common/ir-functions.c
+++ b/drivers/media/common/ir-functions.c
@@ -345,8 +345,8 @@ void ir_rc5_timer_end(unsigned long data)
}
/* Set/reset key-up timer */
- timeout = current_jiffies + (500 + ir->rc5_key_timeout
- * HZ) / 1000;
+ timeout = current_jiffies +
+ msecs_to_jiffies(ir->rc5_key_timeout);
mod_timer(&ir->timer_keyup, timeout);
/* Save code for repeat test */