Commit 7e7b8287 authored by Manu Abraham's avatar Manu Abraham Committed by Mauro Carvalho Chehab

[media] PCTV290E: Attach a single frontend

PCTV290E: Attach a single frontend, rather than a frontend each per
delivery system, whereby a multistandard frontend can advertise all
associated delivery systems.
Signed-off-by: default avatarManu Abraham <abraham.manu@gmail.com>
Acked-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 14c03862
...@@ -829,31 +829,22 @@ static int em28xx_dvb_init(struct em28xx *dev) ...@@ -829,31 +829,22 @@ static int em28xx_dvb_init(struct em28xx *dev)
&dev->i2c_adap, &kworld_a340_config); &dev->i2c_adap, &kworld_a340_config);
break; break;
case EM28174_BOARD_PCTV_290E: 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, 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]) { if (dvb->fe[0]) {
/* FE 0 attach tuner */ /* FE 0 attach tuner */
if (!dvb_attach(tda18271_attach, dvb->fe[0], 0x60, if (!dvb_attach(tda18271_attach,
&dev->i2c_adap, &em28xx_cxd2820r_tda18271_config)) { dvb->fe[0],
0x60,
&dev->i2c_adap,
&em28xx_cxd2820r_tda18271_config)) {
dvb_frontend_detach(dvb->fe[0]); dvb_frontend_detach(dvb->fe[0]);
result = -EINVAL; result = -EINVAL;
goto out_free; 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; break;
case EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C: case EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment