Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5584c641 authored by Jonathan Nieder's avatar Jonathan Nieder Committed by Mauro Carvalho Chehab
Browse files

[media] dm1105: handle errors from dvb_net_init 



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: default avatarJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2dbbac33

drivers/media/dvb/dm1105/dm1105.c

+4 −1
Original line number Diff line number Diff line
@@ -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);