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

Commit e9ef88bd authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] em28xx-dvb: create RF connector on DVB-only mode 



When in analog mode, the RF connector will be created by
em28xx-video. However, when the device is in digital mode only,
the RF connector is not shown. In this case, let the DVB
core to create it for us.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 67873d4e

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

+6 −1
Original line number Diff line number Diff line
@@ -905,6 +905,7 @@ static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module, 
			       struct em28xx *dev, struct device *device)

{

	int result;

	bool create_rf_connector = false;



	mutex_init(&dvb->lock);
@@ -998,7 +999,11 @@ static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module, 
	/* register network adapter */

	dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx);



	result = dvb_create_media_graph(&dvb->adapter, false);

	/* If the analog part won't create RF connectors, DVB will do it */

	if (!dev->has_video || (dev->tuner_type == TUNER_ABSENT))

		create_rf_connector = true;



	result = dvb_create_media_graph(&dvb->adapter, create_rf_connector);

	if (result < 0)

		goto fail_create_graph;

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

+2 −1
Original line number Diff line number Diff line
@@ -990,6 +990,7 @@ static void em28xx_v4l2_create_entities(struct em28xx *dev) 
			ent->function = MEDIA_ENT_F_CONN_SVIDEO;

			break;

		default: /* EM28XX_VMUX_TELEVISION or EM28XX_RADIO */

			if (dev->tuner_type != TUNER_ABSENT)

				ent->function = MEDIA_ENT_F_CONN_RF;

			break;

		}