aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bt8xx/bttv-input.c
diff options
context:
space:
mode:
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)
153{ 153{
154 if (ir->polling) { 154 if (ir->polling) {
155 setup_timer(&ir->timer, bttv_input_timer, (unsigned long)btv); 155 setup_timer(&ir->timer, bttv_input_timer, (unsigned long)btv);
156 ir->timer.expires = jiffies + HZ; 156 ir->timer.expires = jiffies + msecs_to_jiffies(1000);
157 add_timer(&ir->timer); 157 add_timer(&ir->timer);
158 } else if (ir->rc5_gpio) { 158 } else if (ir->rc5_gpio) {
159 /* set timer_end for code completion */ 159 /* set timer_end for code completion */