From patchwork Thu Jul 28 21:59:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antti Palosaari X-Patchwork-Id: 1018072 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6SLxcds016983 for ; Thu, 28 Jul 2011 21:59:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754024Ab1G1V7d (ORCPT ); Thu, 28 Jul 2011 17:59:33 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:50862 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753774Ab1G1V7c (ORCPT ); Thu, 28 Jul 2011 17:59:32 -0400 Received: from dyn3-82-128-185-212.psoas.suomi.net ([82.128.185.212] helo=localhost.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1QmYc6-0008Gl-Nm for linux-media@vger.kernel.org; Fri, 29 Jul 2011 00:59:30 +0300 Message-ID: <4E31DBC2.4060708@iki.fi> Date: Fri, 29 Jul 2011 00:59:30 +0300 From: Antti Palosaari User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.18) Gecko/20110621 Fedora/3.1.11-1.fc15 Thunderbird/3.1.11 MIME-Version: 1.0 To: linux-media@vger.kernel.org Subject: [PATCH] em28xx: use MFE lock for PCTV nanoStick T2 290e X-SA-Exim-Connect-IP: 82.128.185.212 X-SA-Exim-Mail-From: crope@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false 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, 28 Jul 2011 22:00:07 +0000 (UTC) Signed-off-by: Antti Palosaari --- drivers/media/video/em28xx/em28xx-dvb.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c index ab8a740..b9cfe93 100644 --- a/drivers/media/video/em28xx/em28xx-dvb.c +++ b/drivers/media/video/em28xx/em28xx-dvb.c @@ -604,7 +604,7 @@ static void unregister_dvb(struct em28xx_dvb *dvb) static int dvb_init(struct em28xx *dev) { - int result = 0; + int result = 0, mfe_shared = 0; struct em28xx_dvb *dvb; if (!dev->board.has_dvb) { @@ -767,6 +767,8 @@ static int dvb_init(struct em28xx *dev) dvb_frontend_detach(dvb->fe[1]); /* leave FE 0 still active */ } + + mfe_shared = 1; } break; case EM2884_BOARD_TERRATEC_H5: @@ -823,6 +825,9 @@ static int dvb_init(struct em28xx *dev) if (result < 0) goto out_free; + /* MFE lock */ + dvb->adapter.mfe_shared = mfe_shared; + em28xx_info("Successfully loaded em28xx-dvb\n"); ret: em28xx_set_mode(dev, EM28XX_SUSPEND);