From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965208AbaD2Tu2 (ORCPT ); Tue, 29 Apr 2014 15:50:28 -0400 Received: from qmta13.emeryville.ca.mail.comcast.net ([76.96.27.243]:50446 "EHLO qmta13.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965191AbaD2TuW (ORCPT ); Tue, 29 Apr 2014 15:50:22 -0400 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: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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) { -- 1.7.10.4