diff options
| author |   Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-09-04 15:33:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-01-11 12:18:59 -0200 |
| commit | 0d3ab8410dcb60aef2104231ba817037b3ba73bd (patch) | |
| tree | ced0091bb244d4f5b64a04bfde9a314e9e960e69 /drivers/media/usb/au0828 | |
| parent | [media] v4l2 core: enable all interface links at init (diff) | |
| download | linux-dev-0d3ab8410dcb60aef2104231ba817037b3ba73bd.tar.xz linux-dev-0d3ab8410dcb60aef2104231ba817037b3ba73bd.zip | |
[media] dvb core: must check dvb_create_media_graph()
If media controller is enabled and mdev is filled, it should
ensure that the media graph will be properly initialized.
Enforce that.
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/au0828')
| -rw-r--r-- | drivers/media/usb/au0828/au0828-dvb.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/usb/au0828/au0828-dvb.c b/drivers/media/usb/au0828/au0828-dvb.c index c01772c4f9f0..cd542b49a6c2 100644 --- a/drivers/media/usb/au0828/au0828-dvb.c +++ b/drivers/media/usb/au0828/au0828-dvb.c @@ -486,12 +486,14 @@ static int dvb_register(struct au0828_dev *dev) dvb->start_count = 0; dvb->stop_count = 0; -#ifdef CONFIG_MEDIA_CONTROLLER_DVB - dvb_create_media_graph(&dvb->adapter); -#endif + result = dvb_create_media_graph(&dvb->adapter); + if (result < 0) + goto fail_create_graph; return 0; +fail_create_graph: + dvb_net_release(&dvb->net); fail_fe_conn: dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_mem); fail_fe_mem: |