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/dvb-usb | |
| parent | 13f6e8887a1f61764a05a3348476d38071201f08 (diff) | |
| download | blackbird-op-linux-0d3ab8410dcb60aef2104231ba817037b3ba73bd.tar.gz blackbird-op-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/dvb-usb')
| -rw-r--r-- | drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c index 8a260c854653..b51dbdf03f42 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c @@ -318,10 +318,12 @@ int dvb_usb_adapter_frontend_init(struct dvb_usb_adapter *adap) adap->num_frontends_initialized++; } + if (ret) + return ret; - dvb_create_media_graph(&adap->dvb_adap); + ret = dvb_create_media_graph(&adap->dvb_adap); - return 0; + return ret; } int dvb_usb_adapter_frontend_exit(struct dvb_usb_adapter *adap) |
