diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-02-03 17:12:42 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-02-03 17:13:05 -0500 |
| commit | 972c5ae961d6e5103e2b33d935cfa4145fd47140 (patch) | |
| tree | 350b2a76b979ba8766c09838617df67ff330eca0 /drivers/media/dvb/dm1105/dm1105.c | |
| parent | 5196d20305d5e30d871111d3a876cf067dd94255 (diff) | |
| parent | 7c7ed8ec337bf5f62cc5287a6eb6b2f1b7504c2f (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply patch to a newer
code (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)
Diffstat (limited to 'drivers/media/dvb/dm1105/dm1105.c')
| -rw-r--r-- | drivers/media/dvb/dm1105/dm1105.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c index 55e6533f15e9..a609b3a9b146 100644 --- a/drivers/media/dvb/dm1105/dm1105.c +++ b/drivers/media/dvb/dm1105/dm1105.c | |||
| @@ -1115,11 +1115,14 @@ static int __devinit dm1105_probe(struct pci_dev *pdev, | |||
| 1115 | if (ret < 0) | 1115 | if (ret < 0) |
| 1116 | goto err_remove_mem_frontend; | 1116 | goto err_remove_mem_frontend; |
| 1117 | 1117 | ||
| 1118 | ret = frontend_init(dev); | 1118 | ret = dvb_net_init(dvb_adapter, &dev->dvbnet, dmx); |
| 1119 | if (ret < 0) | 1119 | if (ret < 0) |
| 1120 | goto err_disconnect_frontend; | 1120 | goto err_disconnect_frontend; |
| 1121 | 1121 | ||
| 1122 | dvb_net_init(dvb_adapter, &dev->dvbnet, dmx); | 1122 | ret = frontend_init(dev); |
| 1123 | if (ret < 0) | ||
| 1124 | goto err_dvb_net; | ||
| 1125 | |||
| 1123 | dm1105_ir_init(dev); | 1126 | dm1105_ir_init(dev); |
| 1124 | 1127 | ||
| 1125 | INIT_WORK(&dev->work, dm1105_dmx_buffer); | 1128 | INIT_WORK(&dev->work, dm1105_dmx_buffer); |