Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285734
b: refs/heads/master
c: 5584c64
h: refs/heads/master
v: v3
  • Loading branch information
Jonathan Nieder authored and Mauro Carvalho Chehab committed Jan 6, 2012
1 parent 25c0e5f commit d9336cb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2dbbac330621e83d00e904d1139b62e7b360f946
refs/heads/master: 5584c641be9e4ff812443511363a72edaa5ceeaa
5 changes: 4 additions & 1 deletion trunk/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 d9336cb

Please sign in to comment.