---

yaml --- r: 271672 b: refs/heads/master c: e364543 h: refs/heads/master v: v3
git-mirror · Aug 27, 2011 · e3c821d · e3c821d
1 parent 5adff50
commit e3c821d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb28dc39d3e82674584cc768b9757d1cae222a52
+refs/heads/master: e36454376a8f4637c0767daa78cf1d96d162d71a
diff --git a/trunk/drivers/media/video/em28xx/em28xx-dvb.c b/trunk/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);