From 6ffa1eb8b595adb4fa10e58d393f99c3fdfd75b1 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 28 Jun 2010 12:59:49 -0300 Subject: [PATCH] --- yaml --- r: 202075 b: refs/heads/master c: 89c3bc78075042ae1f4452687f626acce06b3b21 h: refs/heads/master i: 202073: 617f8321265a1d5e00f550a5aa489c31fdf54ae1 202071: a18b69a9d625a8cbcfce12cce2478ebfbc3e5126 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/cx88-cards.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 90b5f01736b0..bc338d035088 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15ceb6b1c30ea40bdbe6a6246e2468d9bab375f5 +refs/heads/master: 89c3bc78075042ae1f4452687f626acce06b3b21 diff --git a/trunk/drivers/media/video/cx88/cx88-cards.c b/trunk/drivers/media/video/cx88/cx88-cards.c index 658ee90db5a4..e8416b76da67 100644 --- a/trunk/drivers/media/video/cx88/cx88-cards.c +++ b/trunk/drivers/media/video/cx88/cx88-cards.c @@ -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(struct pci_dev *pci, int nr) } 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; }