diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2011-12-31 06:10:57 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-06 09:50:39 -0500 |
commit | 60826f02695476ded2fecc67949c83dc4b49def7 (patch) | |
tree | 3f09c67579560db28a452b46e0c553b0ab4b9665 /drivers/media/dvb/dvb-usb | |
parent | 5584c641be9e4ff812443511363a72edaa5ceeaa (diff) |
[media] dvb-usb: handle errors from dvb_net_init
From an audit of dvb_net_init callers, now that that function
returns -errno on error.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c index ba4a7517354f..ddf282f355b3 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c +++ b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | |||
@@ -141,11 +141,17 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums) | |||
141 | goto err_dmx_dev; | 141 | goto err_dmx_dev; |
142 | } | 142 | } |
143 | 143 | ||
144 | dvb_net_init(&adap->dvb_adap, &adap->dvb_net, &adap->demux.dmx); | 144 | if ((ret = dvb_net_init(&adap->dvb_adap, &adap->dvb_net, |
145 | &adap->demux.dmx)) < 0) { | ||
146 | err("dvb_net_init failed: error %d",ret); | ||
147 | goto err_net_init; | ||
148 | } | ||
145 | 149 | ||
146 | adap->state |= DVB_USB_ADAP_STATE_DVB; | 150 | adap->state |= DVB_USB_ADAP_STATE_DVB; |
147 | return 0; | 151 | return 0; |
148 | 152 | ||
153 | err_net_init: | ||
154 | dvb_dmxdev_release(&adap->dmxdev); | ||
149 | err_dmx_dev: | 155 | err_dmx_dev: |
150 | dvb_dmx_release(&adap->demux); | 156 | dvb_dmx_release(&adap->demux); |
151 | err_dmx: | 157 | err_dmx: |