From: Antti Palosaari <crope@iki.fi>
Date: Thu, 28 Jul 2011 21:59:30 +0000 (-0300)
Subject: [media] em28xx: use MFE lock for PCTV nanoStick T2 290e
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e36454376a8f4637c0767daa78cf1d96d162d71a;p=linux-beck.git

[media] em28xx: use MFE lock for PCTV nanoStick T2 290e

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index e5916dee4094..47b4cfa423d2 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -609,7 +609,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) {
@@ -772,6 +772,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:
@@ -828,6 +830,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);