From patchwork Thu Mar 10 15:29:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Issa Gorissen X-Patchwork-Id: 624921 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 p2AFThUY028143 for ; Thu, 10 Mar 2011 15:29:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753082Ab1CJP3l (ORCPT ); Thu, 10 Mar 2011 10:29:41 -0500 Received: from cmsout02.mbox.net ([165.212.64.32]:60007 "EHLO cmsout02.mbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753015Ab1CJP3k (ORCPT ); Thu, 10 Mar 2011 10:29:40 -0500 Received: from cmsout02.mbox.net (co02-lo [127.0.0.1]) by cmsout02.mbox.net (Postfix) with ESMTP id 176581344D2; Thu, 10 Mar 2011 15:29:40 +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 643PcJPdj0464M02; Thu, 10 Mar 2011 15:29:35 -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 XID651PcJPdj5085X02; Thu, 10 Mar 2011 15:29:35 -0000 X-USANET-Source: 165.212.11.133 IN flop.m@usa.net cmsapps04.cms.usa.net X-USANET-MsgId: XID651PcJPdj5085X02 Received: from [192.168.79.121] [85.201.143.112] by cmsapps04.cms.usa.net (ESMTPSA/flop.m@usa.net) via mtad (C8.MAIN.3.72B) with ESMTPSA id 389PcJPdI5168M40; Thu, 10 Mar 2011 15:29:35 -0000 X-USANET-Auth: 85.201.143.112 AUTH flop.m@usa.net [192.168.79.121] Date: Thu, 10 Mar 2011 16:29:21 +0100 (CET) From: Issa Gorissen X-X-Sender: issa@hp8540w.home To: linux-media@vger.kernel.org cc: rjkm@metzlerbros.de Subject: [PATCH] Ngene cam device name Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Z-USANET-MsgId: XID389PcJPdj5168X40 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]); Thu, 10 Mar 2011 15:29:43 +0000 (UTC) diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h index fcc6ae9..dcac27d 100644 --- a/drivers/media/dvb/dvb-core/dvbdev.h +++ b/drivers/media/dvb/dvb-core/dvbdev.h @@ -40,7 +40,7 @@ #define DVB_DEVICE_VIDEO 0 #define DVB_DEVICE_AUDIO 1 -#define DVB_DEVICE_SEC 2 +#define DVB_DEVICE_CAM 2 #define DVB_DEVICE_FRONTEND 3 #define DVB_DEVICE_DEMUX 4 #define DVB_DEVICE_DVR 5 diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c index 175a0f6..6be2d7c 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_CAM); if (!chan->ci_dev) goto err; }