From patchwork Wed Jan 27 11:02:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 75431 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0RB2I82026823 for ; Wed, 27 Jan 2010 11:02:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751018Ab0A0LCR (ORCPT ); Wed, 27 Jan 2010 06:02:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751228Ab0A0LCR (ORCPT ); Wed, 27 Jan 2010 06:02:17 -0500 Received: from poutre.nerim.net ([62.4.16.124]:53026 "EHLO poutre.nerim.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750972Ab0A0LCQ (ORCPT ); Wed, 27 Jan 2010 06:02:16 -0500 Received: from localhost (localhost [127.0.0.1]) by poutre.nerim.net (Postfix) with ESMTP id 4E23539E0E6; Wed, 27 Jan 2010 12:02:13 +0100 (CET) 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 CvjTB6v3Oj5b; Wed, 27 Jan 2010 12:02:11 +0100 (CET) Received: from hyperion.delvare (jdelvare.pck.nerim.net [62.212.121.182]) by poutre.nerim.net (Postfix) with ESMTP id D0E8F39E019; Wed, 27 Jan 2010 12:02:10 +0100 (CET) Date: Wed, 27 Jan 2010 12:02:11 +0100 From: Jean Delvare To: LMML Cc: Daro , Roman Kellner Subject: [PATCH] saa7134: Fix IR support of some ASUS TV-FM 7135 variants Message-ID: <20100127120211.2d022375@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 --- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134-cards.c 2010-01-25 21:25:58.000000000 +0100 +++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c 2010-01-27 10:22:35.000000000 +0100 @@ -7299,6 +7299,7 @@ int saa7134_board_init2(struct saa7134_d printk(KERN_INFO "%s: P7131 analog only, using " "entry of %s\n", dev->name, saa7134_boards[dev->board].name); + dev->has_remote = SAA7134_REMOTE_GPIO; } break; case SAA7134_BOARD_HAUPPAUGE_HVR1150: --- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134-core.c 2010-01-25 21:25:50.000000000 +0100 +++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-core.c 2010-01-27 10:39:55.000000000 +0100 @@ -735,7 +735,6 @@ static int saa7134_hwinit1(struct saa713 saa7134_vbi_init1(dev); if (card_has_mpeg(dev)) saa7134_ts_init1(dev); - saa7134_input_init1(dev); saa7134_hw_enable1(dev); @@ -781,6 +780,7 @@ static int saa7134_hwinit2(struct saa713 dprintk("hwinit2\n"); + saa7134_input_init2(dev); saa7134_video_init2(dev); saa7134_tvaudio_init2(dev); --- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134-input.c 2010-01-25 21:25:50.000000000 +0100 +++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c 2010-01-27 10:33:23.000000000 +0100 @@ -506,7 +506,7 @@ void saa7134_ir_stop(struct saa7134_dev del_timer_sync(&dev->remote->timer); } -int saa7134_input_init1(struct saa7134_dev *dev) +int saa7134_input_init2(struct saa7134_dev *dev) { struct card_ir *ir; struct input_dev *input_dev; --- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134.h 2010-01-25 21:25:50.000000000 +0100 +++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h 2010-01-27 10:34:57.000000000 +0100 @@ -812,7 +812,7 @@ void saa7134_irq_oss_done(struct saa7134 /* ----------------------------------------------------------- */ /* saa7134-input.c */ -int saa7134_input_init1(struct saa7134_dev *dev); +int saa7134_input_init2(struct saa7134_dev *dev); void saa7134_input_fini(struct saa7134_dev *dev); void saa7134_input_irq(struct saa7134_dev *dev); #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)