summaryrefslogtreecommitdiff
path: root/drivers/media/video/bt8xx/bttv-input.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-07-17 23:36:20 +0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-21 00:35:51 +0400
commitfe06fe0a4d0f781f8ae0570e4d7e517a81878c1d (patch)
treebad27deb2805b67d39e025490e68e9572f70f212 /drivers/media/video/bt8xx/bttv-input.c
parent818ca4711eb8ec064c1cd5d7657f95ed6bc2bbed (diff)
downloadlinux-fe06fe0a4d0f781f8ae0570e4d7e517a81878c1d.tar.xz
V4L/DVB (5861): Use msecs_to_jiffies instead of HZ on bttv, cx88 and saa7134
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-input.c')
-rw-r--r--drivers/media/video/bt8xx/bttv-input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index 94a13d0ee614..4201552bc3c0 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -153,7 +153,7 @@ static void bttv_ir_start(struct bttv *btv, struct card_ir *ir)
{
if (ir->polling) {
setup_timer(&ir->timer, bttv_input_timer, (unsigned long)btv);
- ir->timer.expires = jiffies + HZ;
+ ir->timer.expires = jiffies + msecs_to_jiffies(1000);
add_timer(&ir->timer);
} else if (ir->rc5_gpio) {
/* set timer_end for code completion */