From patchwork Mon Jun 28 15:59:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 108388 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5SFxsHB022085 for ; Mon, 28 Jun 2010 15:59:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754354Ab0F1P7w (ORCPT ); Mon, 28 Jun 2010 11:59:52 -0400 Received: from poutre.nerim.net ([62.4.16.124]:51972 "EHLO poutre.nerim.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751491Ab0F1P7v (ORCPT ); Mon, 28 Jun 2010 11:59:51 -0400 Received: from localhost (localhost [127.0.0.1]) by poutre.nerim.net (Postfix) with ESMTP id 5C6A539DE95 for ; Mon, 28 Jun 2010 17:59:48 +0200 (CEST) X-Virus-Scanned: amavisd-new at nerim.net Received: from poutre.nerim.net ([127.0.0.1]) by localhost (poutre.nerim.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9SXauv9YMewc for ; Mon, 28 Jun 2010 17:59:47 +0200 (CEST) Received: from hyperion.delvare (jdelvare.pck.nerim.net [62.212.121.182]) by poutre.nerim.net (Postfix) with ESMTP id 5A5F439DEBF for ; Mon, 28 Jun 2010 17:59:47 +0200 (CEST) Date: Mon, 28 Jun 2010 17:59:49 +0200 From: Jean Delvare To: LMML Subject: [PATCH 2/2] V4L/DVB: cx88: Let the user disable IR support Message-ID: <20100628175949.293d1673@hyperion.delvare> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.14.4; i586-suse-linux-gnu) Mime-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 28 Jun 2010 15:59:54 +0000 (UTC) --- 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; }