projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6c59eef)
[media] dm1105: release dvbnet on frontend attachment failure
authorJonathan Nieder <jrnieder@gmail.com>
Fri, 6 Jan 2012 17:40:26 +0000 (14:40 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 7 Jan 2012 13:54:03 +0000 (11:54 -0200)
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>
drivers/media/dvb/dm1105/dm1105.c patch | blob | blame | history

diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index 70e040b999e736f6dab3f28734bdc61987f2683a..a609b3a9b14695bfff2a3e53a387c241e4b38107 100644 (file)
--- 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);