diff options
Diffstat (limited to 'linux/drivers/media/dvb/ttpci')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_ir.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/budget-av.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110_ir.c b/linux/drivers/media/dvb/ttpci/av7110_ir.c index e5fa5b08a..6d2256f1e 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_ir.c +++ b/linux/drivers/media/dvb/ttpci/av7110_ir.c @@ -161,11 +161,11 @@ static int av7110_ir_write_proc(struct file *file, const char __user *buffer, int __init av7110_ir_init(void) { + static struct proc_dir_entry *e; + if (ir_initialized) return 0; - static struct proc_dir_entry *e; - init_timer(&keyup_timer); keyup_timer.data = 0; diff --git a/linux/drivers/media/dvb/ttpci/budget-av.c b/linux/drivers/media/dvb/ttpci/budget-av.c index f3754ed89..2cc3e9993 100644 --- a/linux/drivers/media/dvb/ttpci/budget-av.c +++ b/linux/drivers/media/dvb/ttpci/budget-av.c @@ -188,6 +188,7 @@ static int ciintf_slot_reset(struct dvb_ca_en50221 *ca, int slot) { struct budget_av *budget_av = (struct budget_av *) ca->data; struct saa7146_dev *saa = budget_av->budget.dev; + int max = 20; if (slot != 0) return -EINVAL; @@ -199,7 +200,6 @@ static int ciintf_slot_reset(struct dvb_ca_en50221 *ca, int slot) msleep(100); saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO); - int max = 20; while (--max > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d) msleep(100); |