From: Jonathan Nieder Date: Sat, 31 Dec 2011 11:10:57 +0000 (-0300) Subject: [media] dvb-usb: handle errors from dvb_net_init X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~19853^2~71 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=60826f02695476ded2fecc67949c83dc4b49def7;p=mirror_ubuntu-focal-kernel.git [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 Signed-off-by: Mauro Carvalho Chehab --- 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) 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: