Skip to contentSkip to conversation

anysee: do not attach same frontend twice

PATCH New Antti Palosaari 1 participant 1 message Jan 15, 2012 Media (V4L/DVB)

lore
Share & tools
lore

Antti Palosaari

author
#0 lore raw

PATCH 1/1 anysee: do not attach same frontend twice

cxd2820r implements only one frontend currently which handles all the standards.

Signed-off-by Antti Palosaari <[email protected]>
---
 drivers/media/dvb/dvb-usb/anysee.c |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)
drivers/media/dvb/dvb-usb/anysee.c +7 -13
index df46015..ecc3add 100644
@@ -877,24 +877,18 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
 	case ANYSEE_HW_508T2C: /* 20 */
 		/* E7 T2C */
 
+		if (state->fe_id)
+			break;
+
 		/* enable DVB-T/T2/C demod on IOE[5] */
 		ret = anysee_wr_reg_mask(adap->dev, REG_IOE, (1 << 5), 0x20);
 		if (ret)
 			goto error;
 
-		if (state->fe_id == 0)  {
-			/* DVB-T/T2 */
-			adap->fe_adap[state->fe_id].fe =
-				dvb_attach(cxd2820r_attach,
-				&anysee_cxd2820r_config,
-				&adap->dev->i2c_adap, NULL);
-		} else {
-			/* DVB-C */
-			adap->fe_adap[state->fe_id].fe =
-				dvb_attach(cxd2820r_attach,
-				&anysee_cxd2820r_config,
-				&adap->dev->i2c_adap, adap->fe_adap[0].fe);
-		}
+		/* attach demod */
+		adap->fe_adap[state->fe_id].fe = dvb_attach(cxd2820r_attach,
+				&anysee_cxd2820r_config, &adap->dev->i2c_adap,
+				NULL);
 
 		state->has_ci = true;
Signature · 1 line
1.7.4.4