summaryrefslogtreecommitdiff
path: root/linux/drivers/media
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-17 16:27:30 -0300
commit81be57ff7e56a6c5b7a0eafd6106f1a17c53e95e (patch)
treed9fba3e10812493863719a224826bf6b594e43b4 /linux/drivers/media
parentdae3301f25318ca26e301fc5666fcb67962f6564 (diff)
downloadmediapointer-dvb-s2-81be57ff7e56a6c5b7a0eafd6106f1a17c53e95e.tar.gz
mediapointer-dvb-s2-81be57ff7e56a6c5b7a0eafd6106f1a17c53e95e.tar.bz2
use msecs_to_jiffies on InfraRed RC5 timeout
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/common/ir-functions.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/common/ir-functions.c b/linux/drivers/media/common/ir-functions.c
index 52b216fe6..52f1949f7 100644
--- a/linux/drivers/media/common/ir-functions.c
+++ b/linux/drivers/media/common/ir-functions.c
@@ -353,8 +353,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 */