[2/2] V4L/DVB: cx88: Let the user disable IR support

Commit Message

Jean Delvare June 28, 2010, 3:59 p.m. UTC

None

Patch

--- linux-2.6.34-rc3.orig/drivers/media/video/cx88/cx88-cards.c	2010-04-09 17:53:58.000000000 +0200
+++ linux-2.6.34-rc3/drivers/media/video/cx88/cx88-cards.c	2010-04-09 17:54:14.000000000 +0200
@@ -45,6 +45,10 @@  static unsigned int latency = UNSET;
 module_param(latency,int,0444);
 MODULE_PARM_DESC(latency,"pci latency timer");
 
+static int disable_ir;
+module_param(disable_ir, int, 0444);
+MODULE_PARM_DESC(latency, "Disable IR support");
+
 #define info_printk(core, fmt, arg...) \
 	printk(KERN_INFO "%s: " fmt, core->name , ## arg)
 
@@ -3498,8 +3502,10 @@  struct cx88_core *cx88_core_create(struc
 	}
 
 	cx88_card_setup(core);
-	cx88_i2c_init_ir(core);
-	cx88_ir_init(core, pci);
+	if (!disable_ir) {
+		cx88_i2c_init_ir(core);
+		cx88_ir_init(core, pci);
+	}
 
 	return core;
 }