diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2012-01-06 12:40:26 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-07 08:54:03 -0500 |
commit | e99663417f626c9bfdc8117b35670a0292b820e6 (patch) | |
tree | 70e5f274dacd0b7ba15e1909599f32ff75a48c57 /drivers/media/dvb | |
parent | 6c59eefd58837cf674b18e8b8760d0d0870fa8d5 (diff) |
[media] dm1105: release dvbnet on frontend attachment failure
The patch "dm1105: handle errors from dvb_net_init" moved the
initialization of dvbnet to before frontend attachment but forgot
to adjust the error handling when frontend attachment fails.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/dm1105/dm1105.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c index 70e040b999e7..a609b3a9b146 100644 --- a/drivers/media/dvb/dm1105/dm1105.c +++ b/drivers/media/dvb/dm1105/dm1105.c | |||
@@ -1121,7 +1121,7 @@ static int __devinit dm1105_probe(struct pci_dev *pdev, | |||
1121 | 1121 | ||
1122 | ret = frontend_init(dev); | 1122 | ret = frontend_init(dev); |
1123 | if (ret < 0) | 1123 | if (ret < 0) |
1124 | goto err_disconnect_frontend; | 1124 | goto err_dvb_net; |
1125 | 1125 | ||
1126 | dm1105_ir_init(dev); | 1126 | dm1105_ir_init(dev); |
1127 | 1127 | ||