From patchwork Tue Apr 5 21:50:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Issa Gorissen X-Patchwork-Id: 688901 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p35LpTCh014661 for ; Tue, 5 Apr 2011 21:51:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751774Ab1DEVv0 (ORCPT ); Tue, 5 Apr 2011 17:51:26 -0400 Received: from cmsout02.mbox.net ([165.212.64.32]:55527 "EHLO cmsout02.mbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750940Ab1DEVvZ (ORCPT ); Tue, 5 Apr 2011 17:51:25 -0400 Received: from cmsout02.mbox.net (co02-lo [127.0.0.1]) by cmsout02.mbox.net (Postfix) with ESMTP id 5D09F134502 for ; Tue, 5 Apr 2011 21:51:25 +0000 (GMT) X-USANET-Received: from cmsout02.mbox.net [127.0.0.1] by cmsout02.mbox.net via mtad (C8.MAIN.3.72B) with ESMTP id 103PDeVzV0464M02; Tue, 05 Apr 2011 21:51:20 -0000 X-USANET-Routed: 3 gwsout-vs Q:bmvirus Received: from cmsapps04.cms.usa.net [165.212.11.133] by cmsout02.mbox.net via smtad (C8.MAIN.3.72B) with ESMTP id XID103PDeVzV1064X02; Tue, 05 Apr 2011 21:51:21 -0000 X-USANET-Source: 165.212.11.133 IN flop.m@usa.net cmsapps04.cms.usa.net X-USANET-MsgId: XID103PDeVzV1064X02 Received: from hp8540w.home [85.201.143.112] by cmsapps04.cms.usa.net (ESMTPSA/flop.m@usa.net) via mtad (C8.MAIN.3.72B) with ESMTPSA id 211PDeVzu3968M40; Tue, 05 Apr 2011 21:51:20 -0000 X-USANET-Auth: 85.201.143.112 AUTH flop.m@usa.net hp8540w.home Message-ID: <4D9B8EC2.1030303@usa.net> Date: Tue, 05 Apr 2011 23:50:58 +0200 From: Issa Gorissen User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-GB; rv:1.9.2.14) Gecko/20110221 SUSE/3.1.8 Thunderbird/3.1.8 MIME-Version: 1.0 To: linux-media@vger.kernel.org Subject: Re: [PATCH] Ngene cam device name References: <777PcLohh6368S03.1299940473@web03.cms.usa.net> <4D7B8A07.70602@linuxtv.org> <19855.55774.192407.326483@morden.metzler> <201103290057.03664@orion.escape-edv.de> In-Reply-To: <201103290057.03664@orion.escape-edv.de> Z-USANET-MsgId: XID211PDeVzu3968X40 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.6 (demeter1.kernel.org [140.211.167.41]); Tue, 05 Apr 2011 21:51:29 +0000 (UTC) Hello all, Here is the patch for the NGene card family and the new caio device Signed-off-by: Issa Gorissen --- drivers/media/dvb/dvb-core/dvbdev.c | 2 +- drivers/media/dvb/dvb-core/dvbdev.h | 1 + drivers/media/dvb/ngene/ngene-core.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c index f732877..7a64b81 100644 --- a/drivers/media/dvb/dvb-core/dvbdev.c +++ b/drivers/media/dvb/dvb-core/dvbdev.c @@ -47,7 +47,7 @@ static DEFINE_MUTEX(dvbdev_register_lock); static const char * const dnames[] = { "video", "audio", "sec", "frontend", "demux", "dvr", "ca", - "net", "osd" + "net", "osd", "caio" }; #ifdef CONFIG_DVB_DYNAMIC_MINORS diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h index fcc6ae9..c63c70d 100644 --- a/drivers/media/dvb/dvb-core/dvbdev.h +++ b/drivers/media/dvb/dvb-core/dvbdev.h @@ -47,6 +47,7 @@ #define DVB_DEVICE_CA 6 #define DVB_DEVICE_NET 7 #define DVB_DEVICE_OSD 8 +#define DVB_DEVICE_CAIO 9 #define DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr) \ static short adapter_nr[] = \ diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c index 175a0f6..17cdd38 100644 --- a/drivers/media/dvb/ngene/ngene-core.c +++ b/drivers/media/dvb/ngene/ngene-core.c @@ -1523,7 +1523,7 @@ static int init_channel(struct ngene_channel *chan) set_transfer(&chan->dev->channel[2], 1); dvb_register_device(adapter, &chan->ci_dev, &ngene_dvbdev_ci, (void *) chan, - DVB_DEVICE_SEC); + DVB_DEVICE_CAIO); if (!chan->ci_dev) goto err; }