[media] dm1105: handle errors from dvb_net_init
Jonathan Nieder [Sat, 31 Dec 2011 11:08:45 +0000 (08:08 -0300)]
Clean up and error out if dvb_net_init fails (for example due to
ENOMEM).  This involves moving the dvb_net_init call to before
frontend_init to make cleaning up a little easier.

From an audit of dvb_net_init callers, now that dvb_net_init lets
callers know about errors.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/media/dvb/dm1105/dm1105.c

index 55e6533..70e040b 100644 (file)
@@ -1115,11 +1115,14 @@ static int __devinit dm1105_probe(struct pci_dev *pdev,
        if (ret < 0)
                goto err_remove_mem_frontend;
 
+       ret = dvb_net_init(dvb_adapter, &dev->dvbnet, dmx);
+       if (ret < 0)
+               goto err_disconnect_frontend;
+
        ret = frontend_init(dev);
        if (ret < 0)
                goto err_disconnect_frontend;
 
-       dvb_net_init(dvb_adapter, &dev->dvbnet, dmx);
        dm1105_ir_init(dev);
 
        INIT_WORK(&dev->work, dm1105_dmx_buffer);