From: Jonathan Nieder Date: Fri, 6 Jan 2012 17:40:26 +0000 (-0300) Subject: [media] dm1105: release dvbnet on frontend attachment failure X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e99663417f626c9bfdc8117b35670a0292b820e6;p=mv-sheeva.git [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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c index 70e040b999e..a609b3a9b14 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);