Commit 978bbc39 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Mauro Carvalho Chehab
Browse files

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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent e5833b56

drivers/media/pci/tw686x/tw686x-core.c

+4 −1
Original line number Diff line number Diff line
@@ -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: