media: tw686x: Fix an error handling path in tw686x_probe()

The commit in Fixes: is incomplete. It has moved some code in the probe but
not all error handling paths have been updated.

Now, if request_irq() fails, we must release some resources.

Fixes: c8946454ed96 ("media: tw686x: Register the irq at the end of probe")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/pci/tw686x/tw686x-core.c b/drivers/media/pci/tw686x/tw686x-core.c
index 384d38754a4b1ed794622e7faf418d00c00c7f76..c53099c958ca8b6895ba3be2e2917bf8363dfc5a 100644 (file)
--- a/drivers/media/pci/tw686x/tw686x-core.c
+++ b/drivers/media/pci/tw686x/tw686x-core.c
@@ -337,12 +337,15 @@ static int tw686x_probe(struct pci_dev *pci_dev,
                          dev->name, dev);
        if (err < 0) {
                dev_err(&pci_dev->dev, "unable to request interrupt\n");
-               goto iounmap;
+               goto tw686x_free;
        }
 
        pci_set_drvdata(pci_dev, dev);
        return 0;
 
+tw686x_free:
+       tw686x_video_free(dev);
+       tw686x_audio_free(dev);
 iounmap:
        pci_iounmap(pci_dev, dev->mmio);
 free_region: