From 45b8c3e4e840a34846d13184378e871a9442b38c Mon Sep 17 00:00:00 2001
From: Manu Abraham <abraham.manu@gmail.com>
Date: Sat, 10 Dec 2011 00:44:24 -0300
Subject: [PATCH] --- yaml --- r: 285423 b: refs/heads/master c:
 7e7b8287af32400daea1e231057b4b75934af347 h: refs/heads/master i:   285421:
 668fd39589876dd73eeaff4e0268c7ebd8df7707   285419:
 ff2d28ffac076d2c7e566a6528619408173c4557   285415:
 d8be7fe50b9dae5240bda673d15887264bd273ce   285407:
 df05f0802063c12598e04b265d78590f8991c2fe v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/media/video/em28xx/em28xx-dvb.c | 27 +++++++------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 0e3b13a3c262..851eab0cdbb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14c038627e275f7ccec4761350783340a7c1ae2b
+refs/heads/master: 7e7b8287af32400daea1e231057b4b75934af347
diff --git a/trunk/drivers/media/video/em28xx/em28xx-dvb.c b/trunk/drivers/media/video/em28xx/em28xx-dvb.c
index 3868c1e73592..e733b8ea2564 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-dvb.c
@@ -829,31 +829,22 @@ static int em28xx_dvb_init(struct em28xx *dev)
 				   &dev->i2c_adap, &kworld_a340_config);
 		break;
 	case EM28174_BOARD_PCTV_290E:
-		/* MFE
-		 * FE 0 = DVB-T/T2 + FE 1 = DVB-C, both sharing same tuner. */
-		/* FE 0 */
 		dvb->fe[0] = dvb_attach(cxd2820r_attach,
-			&em28xx_cxd2820r_config, &dev->i2c_adap, NULL);
+					&em28xx_cxd2820r_config,
+					&dev->i2c_adap,
+					NULL);
 		if (dvb->fe[0]) {
 			/* FE 0 attach tuner */
-			if (!dvb_attach(tda18271_attach, dvb->fe[0], 0x60,
-				&dev->i2c_adap, &em28xx_cxd2820r_tda18271_config)) {
+			if (!dvb_attach(tda18271_attach,
+					dvb->fe[0],
+					0x60,
+					&dev->i2c_adap,
+					&em28xx_cxd2820r_tda18271_config)) {
+
 				dvb_frontend_detach(dvb->fe[0]);
 				result = -EINVAL;
 				goto out_free;
 			}
-			/* FE 1. This dvb_attach() cannot fail. */
-			dvb->fe[1] = dvb_attach(cxd2820r_attach, NULL, NULL,
-				dvb->fe[0]);
-			dvb->fe[1]->id = 1;
-			/* FE 1 attach tuner */
-			if (!dvb_attach(tda18271_attach, dvb->fe[1], 0x60,
-				&dev->i2c_adap, &em28xx_cxd2820r_tda18271_config)) {
-				dvb_frontend_detach(dvb->fe[1]);
-				/* leave FE 0 still active */
-			}
-
-			mfe_shared = 1;
 		}
 		break;
 	case EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C: