leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab
2016-02-11 17:17:30 -02:00
parent 67873d4e75
commit e9ef88bd16
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/usb/em28xx/em28xx-dvb.c
View File

@@ -905,6 +905,7 @@ static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module,
struct em28xx *dev, struct device *device) struct em28xx *dev, struct device *device)
{ {
int result; int result;
bool create_rf_connector = false;
mutex_init(&dvb->lock); mutex_init(&dvb->lock);
@@ -998,7 +999,11 @@ static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module,
/* register network adapter */ /* register network adapter */
dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx); 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) if (result < 0)
goto fail_create_graph; goto fail_create_graph;

3
drivers/media/usb/em28xx/em28xx-video.c
View File

@@ -990,7 +990,8 @@ static void em28xx_v4l2_create_entities(struct em28xx *dev)
ent->function = MEDIA_ENT_F_CONN_SVIDEO; ent->function = MEDIA_ENT_F_CONN_SVIDEO;
break; break;
default: /* EM28XX_VMUX_TELEVISION or EM28XX_RADIO */ default: /* EM28XX_VMUX_TELEVISION or EM28XX_RADIO */
ent->function = MEDIA_ENT_F_CONN_RF; if (dev->tuner_type != TUNER_ABSENT)
ent->function = MEDIA_ENT_F_CONN_RF;
break; break;
} }