From patchwork Tue Apr 29 19:49:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 4088851 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2679A9F169 for ; Tue, 29 Apr 2014 19:50:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5715D20218 for ; Tue, 29 Apr 2014 19:50:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 76E84200D7 for ; Tue, 29 Apr 2014 19:50:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965206AbaD2Tu2 (ORCPT ); Tue, 29 Apr 2014 15:50:28 -0400 Received: from qmta02.emeryville.ca.mail.comcast.net ([76.96.30.24]:44941 "EHLO qmta02.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965168AbaD2TuW (ORCPT ); Tue, 29 Apr 2014 15:50:22 -0400 Received: from omta09.emeryville.ca.mail.comcast.net ([76.96.30.20]) by qmta02.emeryville.ca.mail.comcast.net with comcast id vvSa1n0040S2fkCA2vqNmz; Tue, 29 Apr 2014 19:50:22 +0000 Received: from mail.gonehiking.org ([50.134.149.16]) by omta09.emeryville.ca.mail.comcast.net with comcast id vvqM1n0060MU7Qa8VvqMXb; Tue, 29 Apr 2014 19:50:22 +0000 Received: from lorien.sisa.samsung.com (lorien-wl.internal [192.168.1.40]) by mail.gonehiking.org (Postfix) with ESMTP id E4AF73FC77; Tue, 29 Apr 2014 13:50:20 -0600 (MDT) From: Shuah Khan To: gregkh@linuxfoundation.org, m.chehab@samsung.com, tj@kernel.org, olebowle@gmx.com Cc: Shuah Khan , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 4/4] media: em28xx dvb changes to initialze tuner token Date: Tue, 29 Apr 2014 13:49:26 -0600 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1398801022; bh=zeC4/TNsfgxI//DhJxguWZcrrRigcnmcZ/rg078kaLc=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=t+AVD5aiwCpd5InooUpTjtyFsNGaB7zvVi9NQnmrN5DdkwF3eEgkV0Mhw9Hjdj/XF jUVDPPr65VPbilAYaDF4rmjgpzueZn7LOiZEAgnyb+xVxIhjcCfEOhTyF4OJg104/2 PhOqd17kljenfIbH5plbzEkX2LfJnA/UFu4YMr+jUpbfXVYffdWkbceYVJhoUeS6/x LRPlRvQz/9DCdmfZ0ZhXvI6/fw1xwqnTrlgUs310dBLy/KQHYn2vEuXSM1ZvP2yDPo 0BWBe1GxWO62trQVFRe99EtNC6TdL/+UjhqwAOGb2BYNq4JHV8BjuwI4/LMmkUH7ty EkGIqzbgg5w5w== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Changes to em28xx-dvb to initialze dvb fe tuner token when dvb fe is registered. This will provide dvb fe the em28xx tuner token devres for sharing tuner across analog and digital functions. Signed-off-by: Shuah Khan --- drivers/media/usb/em28xx/em28xx-dvb.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c index f599b18..829e7c8 100644 --- a/drivers/media/usb/em28xx/em28xx-dvb.c +++ b/drivers/media/usb/em28xx/em28xx-dvb.c @@ -916,6 +916,10 @@ static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module, dvb->adapter.priv = &dev->i2c_bus[dev->def_i2c_bus]; + dvb->fe[0]->tuner_tkn = dev->tuner_tkn; + if (dvb->fe[1]) + dvb->fe[1]->tuner_tkn = dev->tuner_tkn; + /* register frontend */ result = dvb_register_frontend(&dvb->adapter, dvb->fe[0]); if (result < 0) {