[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>

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
index ba4a7517354ff96f52e94f4830c1c0a1c2efc137..ddf282f355b3c78f9f71608f4f445f196d68d3fc 100644 (file)
--- 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)
                goto err_dmx_dev;
        }
 
-       dvb_net_init(&adap->dvb_adap, &adap->dvb_net, &adap->demux.dmx);
+       if ((ret = dvb_net_init(&adap->dvb_adap, &adap->dvb_net,
+                                               &adap->demux.dmx)) < 0) {
+               err("dvb_net_init failed: error %d",ret);
+               goto err_net_init;
+       }
 
        adap->state |= DVB_USB_ADAP_STATE_DVB;
        return 0;
 
+err_net_init:
+       dvb_dmxdev_release(&adap->dmxdev);
 err_dmx_dev:
        dvb_dmx_release(&adap->demux);
 err_dmx: