diff options
author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-09-04 20:33:46 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-01-11 15:18:59 +0100 |
commit | 0d3ab8410dcb60aef2104231ba817037b3ba73bd (patch) | |
tree | ced0091bb244d4f5b64a04bfde9a314e9e960e69 /drivers/media/usb/cx231xx | |
parent | [media] v4l2 core: enable all interface links at init (diff) | |
download | linux-0d3ab8410dcb60aef2104231ba817037b3ba73bd.tar.xz linux-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/cx231xx')
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-dvb.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c index e3594b9fab4a..b7552d20ebdb 100644 --- a/drivers/media/usb/cx231xx/cx231xx-dvb.c +++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c @@ -551,10 +551,14 @@ static int register_dvb(struct cx231xx_dvb *dvb, /* register network adapter */ dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx); - dvb_create_media_graph(&dvb->adapter); + 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: |