diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-03-02 10:49:04 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-03-02 11:25:38 -0300 |
| commit | 480884b647c7efecb904a9ed022ee533afb9cb80 (patch) | |
| tree | d656556a59caefe3f07d349b7a9866a37e7fa5a5 /drivers/media/usb/cx231xx/cx231xx-dvb.c | |
| parent | a3dfc6d925ca1bbd1a228253acb93f08657bad25 (diff) | |
| download | op-kernel-dev-480884b647c7efecb904a9ed022ee533afb9cb80.zip op-kernel-dev-480884b647c7efecb904a9ed022ee533afb9cb80.tar.gz | |
[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/cx231xx-dvb.c')
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-dvb.c | 5 |
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 44229a2..8bf2baa 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, /* register network adapter */ dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx); -#ifdef CONFIG_MEDIA_CONTROLLER_DVB - dvb_create_media_graph(dev->media_dev); -#endif + dvb_create_media_graph(&dvb->adapter); + return 0; fail_fe_conn: |
