From f4cdcc46cf75d629755000fc2e31360461eb5482 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Mon, 21 May 2007 11:41:02 -0300 Subject: [PATCH] --- yaml --- r: 61287 b: refs/heads/master c: b4ba788425f83e0b402a543c816a1cad01873699 h: refs/heads/master i: 61285: ea1562f978dcc4c31226b9c23558ded05fc4dbcf 61283: e3c33ba3ec8e3afc29a2ee1a0d32c941453e9ed6 61279: d743368e3b5e165b85f9241cd28aa3d248588109 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-input.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 6d4daae22477..d70eb8f623e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c57032decdd07e531fc557a207c9ecd5eef9274d +refs/heads/master: b4ba788425f83e0b402a543c816a1cad01873699 diff --git a/trunk/drivers/media/video/saa7134/saa7134-input.c b/trunk/drivers/media/video/saa7134/saa7134-input.c index 817d4b62e222..2de8c2acb660 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-input.c +++ b/trunk/drivers/media/video/saa7134/saa7134-input.c @@ -153,21 +153,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) {