aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/cx231xx
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-03-02 08:49:04 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-03-02 09:25:38 -0500
commit480884b647c7efecb904a9ed022ee533afb9cb80 (patch)
treed656556a59caefe3f07d349b7a9866a37e7fa5a5 /drivers/media/usb/cx231xx
parenta3dfc6d925ca1bbd1a228253acb93f08657bad25 (diff)
[media] dvbdev: use adapter arg for dvb_create_media_graph()
Instead of using media_dev argument for dvb_create_media_graph(), use the adapter. That allows to create a stub for this function, if compiled without DVB support, avoiding to add extra if's at the drivers. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/cx231xx')
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-dvb.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
index 44229a2c2d32..8bf2baae387f 100644
--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
+++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
@@ -540,9 +540,8 @@ static int register_dvb(struct cx231xx_dvb *dvb,
540 540
541 /* register network adapter */ 541 /* register network adapter */
542 dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx); 542 dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx);
543#ifdef CONFIG_MEDIA_CONTROLLER_DVB 543 dvb_create_media_graph(&dvb->adapter);
544 dvb_create_media_graph(dev->media_dev); 544
545#endif
546 return 0; 545 return 0;
547 546
548fail_fe_conn: 547fail_fe_conn: