Skip to content

Commit

Permalink
[media] dm1105: handle errors from dvb_net_init
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jonathan Nieder authored and Mauro Carvalho Chehab committed Jan 6, 2012
1 parent 2dbbac3 commit 5584c64
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/media/dvb/dm1105/dm1105.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 5584c64

Please sign in to comment.