* [PATCH v2] media: tw686x: Fix an error handling path in tw686x_probe()
@ 2022-06-20 5:31 Christophe JAILLET
0 siblings, 0 replies; only message in thread
From: Christophe JAILLET @ 2022-06-20 5:31 UTC (permalink / raw)
To: Ezequiel Garcia, Mauro Carvalho Chehab, Hans Verkuil, Zheyu Ma
Cc: linux-kernel, kernel-janitors, Christophe JAILLET, linux-media
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>
---
v2: Fix a typo in the log message
Fix a typo in the label s/868/686/
---
drivers/media/pci/tw686x/tw686x-core.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/media/pci/tw686x/tw686x-core.c b/drivers/media/pci/tw686x/tw686x-core.c
index 384d38754a4b..af83ebf8eea4 100644
--- 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:
--
2.34.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-20 5:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-20 5:31 [PATCH v2] media: tw686x: Fix an error handling path in tw686x_probe() Christophe JAILLET
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).