Skip to content

Commit

Permalink
V4L/DVB (5682): SAA7134 - switch to use msecs_to_jiffies()
Browse files Browse the repository at this point in the history 
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Dmitry Torokhov authored and Mauro Carvalho Chehab committed Jul 18, 2007
1 parent c57032d commit b4ba788
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions drivers/media/video/saa7134/saa7134-input.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit b4ba788

Please sign in to comment.