[media] dvb-usb: handle errors from dvb_net_init
Jonathan Nieder [Sat, 31 Dec 2011 11:10:57 +0000 (08:10 -0300)]
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>

drivers/media/dvb/dvb-usb/dvb-usb-dvb.c

index ba4a751..ddf282f 100644 (file)
@@ -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: