Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 61287
b: refs/heads/master
c: b4ba788
h: refs/heads/master
i:
  61285: ea1562f
  61283: e3c33ba
  61279: d743368
v: v3
  • Loading branch information
Dmitry Torokhov authored and Mauro Carvalho Chehab committed Jul 18, 2007
1 parent af721d5 commit f4cdcc4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c57032decdd07e531fc557a207c9ecd5eef9274d
refs/heads/master: b4ba788425f83e0b402a543c816a1cad01873699
11 changes: 4 additions & 7 deletions trunk/drivers/media/video/saa7134/saa7134-input.c
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 f4cdcc4

Please sign in to comment.