Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4db8954a authored by Shuah Khan's avatar Shuah Khan Committed by Mauro Carvalho Chehab
Browse files

[media] media: em28xx - add error handling for KWORLD dvb_attach failures 



Add error hanlding when EM2870_BOARD_KWORLD_A340 dvb_attach()
for fe and tuner fail in em28xx_dvb_init().

Signed-off-by: default avatarShuah Khan <shuah.kh@samsung.com>
Reviewed-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 6eb5e339

drivers/media/usb/em28xx/em28xx-dvb.c

+11 −3
Original line number Diff line number Diff line
@@ -1213,9 +1213,17 @@ static int em28xx_dvb_init(struct em28xx *dev) 
		dvb->fe[0] = dvb_attach(lgdt3305_attach,

					   &em2870_lgdt3304_dev,

					   &dev->i2c_adap[dev->def_i2c_bus]);

		if (dvb->fe[0] != NULL)

			dvb_attach(tda18271_attach, dvb->fe[0], 0x60,

				   &dev->i2c_adap[dev->def_i2c_bus], &kworld_a340_config);

		if (!dvb->fe[0]) {

			result = -EINVAL;

			goto out_free;

		}

		if (!dvb_attach(tda18271_attach, dvb->fe[0], 0x60,

			&dev->i2c_adap[dev->def_i2c_bus],

			&kworld_a340_config)) {

				dvb_frontend_detach(dvb->fe[0]);

				result = -EINVAL;

				goto out_free;

		}

		break;

	case EM28174_BOARD_PCTV_290E:

		/* set default GPIO0 for LNA, used if GPIOLIB is undefined */