aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/cx88/cx88-cards.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 658ee90db5a4..e8416b76da67 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -45,6 +45,10 @@ static unsigned int latency = UNSET;
45module_param(latency,int,0444); 45module_param(latency,int,0444);
46MODULE_PARM_DESC(latency,"pci latency timer"); 46MODULE_PARM_DESC(latency,"pci latency timer");
47 47
48static int disable_ir;
49module_param(disable_ir, int, 0444);
50MODULE_PARM_DESC(latency, "Disable IR support");
51
48#define info_printk(core, fmt, arg...) \ 52#define info_printk(core, fmt, arg...) \
49 printk(KERN_INFO "%s: " fmt, core->name , ## arg) 53 printk(KERN_INFO "%s: " fmt, core->name , ## arg)
50 54
@@ -3498,8 +3502,10 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
3498 } 3502 }
3499 3503
3500 cx88_card_setup(core); 3504 cx88_card_setup(core);
3501 cx88_i2c_init_ir(core); 3505 if (!disable_ir) {
3502 cx88_ir_init(core, pci); 3506 cx88_i2c_init_ir(core);
3507 cx88_ir_init(core, pci);
3508 }
3503 3509
3504 return core; 3510 return core;
3505} 3511}