diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-22 00:34:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-22 00:34:25 -0300 |
| commit | 579625a94d4d4391eaea14e8899c10ff84c458c8 (patch) | |
| tree | 618760ecbf356fd293c9cbef00f0ae590b27bacd /linux/drivers/media/video/saa7134 | |
| parent | 282647fc6ca96307a1e740536bbe09d01185f33c (diff) | |
| parent | cac5da1c7c1873320073fccdefc334fc34a745e3 (diff) | |
| download | mediapointer-dvb-s2-579625a94d4d4391eaea14e8899c10ff84c458c8.tar.gz mediapointer-dvb-s2-579625a94d4d4391eaea14e8899c10ff84c458c8.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/cx88
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-input.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c index 1b80a9c3a..c505076ae 100644 --- a/linux/drivers/media/video/saa7134/saa7134-input.c +++ b/linux/drivers/media/video/saa7134/saa7134-input.c @@ -154,21 +154,18 @@ void saa7134_input_irq(struct saa7134_dev *dev) static void saa7134_input_timer(unsigned long data) { - struct saa7134_dev *dev = (struct saa7134_dev*)data; + struct saa7134_dev *dev = (struct saa7134_dev *)data; struct card_ir *ir = dev->remote; - unsigned long timeout; build_key(dev); - timeout = jiffies + (ir->polling * HZ / 1000); - mod_timer(&ir->timer, timeout); + mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling)); } static void saa7134_ir_start(struct saa7134_dev *dev, struct card_ir *ir) { if (ir->polling) { - init_timer(&ir->timer); - ir->timer.function = saa7134_input_timer; - ir->timer.data = (unsigned long)dev; + setup_timer(&ir->timer, saa7134_input_timer, + (unsigned long)dev); ir->timer.expires = jiffies + HZ; add_timer(&ir->timer); } else if (ir->rc5_gpio) { |