aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2012-01-06 14:40:26 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-01-07 11:54:03 -0200
commite99663417f626c9bfdc8117b35670a0292b820e6 (patch)
tree70e5f274dacd0b7ba15e1909599f32ff75a48c57
parent[media] dvb-bt8xx: convert printks to pr_err() (diff)
downloadlinux-dev-e99663417f626c9bfdc8117b35670a0292b820e6.tar.xz
linux-dev-e99663417f626c9bfdc8117b35670a0292b820e6.zip
[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>
-rw-r--r--drivers/media/dvb/dm1105/dm1105.c2
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,
ret = frontend_init(dev);
if (ret < 0)
- goto err_disconnect_frontend;
+ goto err_dvb_net;
dm1105_ir_init(dev);