diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-07-18 23:42:03 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2007-07-18 23:42:03 +0200 |
| commit | 60c5d954541482b1b5d17804bdb00a3ac65452c8 (patch) | |
| tree | 94bc01153d5762d90196a94714e7d6901b0b3a1b /linux/drivers/media/video/bt8xx/bttv-input.c | |
| parent | afd5335417df461fb52a41eee712bd3cdf83e452 (diff) | |
| parent | 018141ee2de19a0e46afdf440d30ca581f465011 (diff) | |
| download | mediapointer-dvb-s2-60c5d954541482b1b5d17804bdb00a3ac65452c8.tar.gz mediapointer-dvb-s2-60c5d954541482b1b5d17804bdb00a3ac65452c8.tar.bz2 | |
Merge: from master
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-input.c')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-input.c b/linux/drivers/media/video/bt8xx/bttv-input.c index 5a5fdd8e2..7d0f338e8 100644 --- a/linux/drivers/media/video/bt8xx/bttv-input.c +++ b/linux/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 */ |