From patchwork Tue Feb 16 17:22:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 79755 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1GHMfw3008803 for ; Tue, 16 Feb 2010 17:22:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933070Ab0BPRWj (ORCPT ); Tue, 16 Feb 2010 12:22:39 -0500 Received: from bamako.nerim.net ([62.4.17.28]:55616 "EHLO bamako.nerim.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932161Ab0BPRWj (ORCPT ); Tue, 16 Feb 2010 12:22:39 -0500 Received: from localhost (localhost [127.0.0.1]) by bamako.nerim.net (Postfix) with ESMTP id EF24039DF9D for ; Tue, 16 Feb 2010 18:22:35 +0100 (CET) X-Virus-Scanned: amavisd-new at nerim.net Received: from bamako.nerim.net ([127.0.0.1]) by localhost (bamako.nerim.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id STivizupJQPH for ; Tue, 16 Feb 2010 18:22:35 +0100 (CET) Received: from hyperion.delvare (jdelvare.pck.nerim.net [62.212.121.182]) by bamako.nerim.net (Postfix) with ESMTP id E783339DF99 for ; Tue, 16 Feb 2010 18:22:34 +0100 (CET) Date: Tue, 16 Feb 2010 18:22:37 +0100 From: Jean Delvare To: LMML Subject: [PATCH 2/2] bttv: Let the user disable IR support Message-ID: <20100216182237.1a06719e@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]); Tue, 16 Feb 2010 17:22:41 +0000 (UTC) --- v4l-dvb.orig/linux/drivers/media/video/bt8xx/bttv-driver.c 2010-02-16 18:13:31.000000000 +0100 +++ v4l-dvb/linux/drivers/media/video/bt8xx/bttv-driver.c 2010-02-16 18:16:47.000000000 +0100 @@ -81,6 +81,7 @@ static int video_nr[BTTV_MAX] = { [0 ... static int radio_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 }; static int vbi_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 }; static int debug_latency; +static int disable_ir; static unsigned int fdsr; @@ -107,6 +108,7 @@ module_param(bttv_gpio, int, 064 module_param(bttv_debug, int, 0644); module_param(irq_debug, int, 0644); module_param(debug_latency, int, 0644); +module_param(disable_ir, int, 0444); module_param(fdsr, int, 0444); module_param(gbuffers, int, 0444); @@ -139,6 +141,7 @@ MODULE_PARM_DESC(bttv_verbose,"verbose s MODULE_PARM_DESC(bttv_gpio,"log gpio changes, default is 0 (no)"); MODULE_PARM_DESC(bttv_debug,"debug messages, default is 0 (no)"); MODULE_PARM_DESC(irq_debug,"irq handler debug messages, default is 0 (no)"); +MODULE_PARM_DESC(disable_ir, "disable infrared remote support"); MODULE_PARM_DESC(gbuffers,"number of capture buffers. range 2-32, default 8"); MODULE_PARM_DESC(gbufsize,"size of the capture buffers, default is 0x208000"); MODULE_PARM_DESC(reset_crop,"reset cropping parameters at open(), default " @@ -4498,8 +4501,10 @@ static int __devinit bttv_probe(struct p request_modules(btv); } - init_bttv_i2c_ir(btv); - bttv_input_init(btv); + if (!disable_ir) { + init_bttv_i2c_ir(btv); + bttv_input_init(btv); + } /* everything is fine */ bttv_num++;