Skip to content

Commit

Permalink
[media] PCTV290E: Attach a single frontend
Browse files Browse the repository at this point in the history
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: Manu Abraham <abraham.manu@gmail.com>
Acked-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Manu Abraham authored and Mauro Carvalho Chehab committed Dec 30, 2011
1 parent 14c0386 commit 7e7b828
Showing 1 changed file with 9 additions and 18 deletions.
27 changes: 9 additions & 18 deletions drivers/media/video/em28xx/em28xx-dvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 7e7b828

Please sign in to comment.