Skip to content

Commit da312cd

Browse files
Liu Shixinsmb49
authored andcommitted
media: saa7164: fix missing pci_disable_device()
BugLink: https://bugs.launchpad.net/bugs/2003914 [ Upstream commit 57fb35d ] Add missing pci_disable_device() in the error path in saa7164_initdev(). Fixes: 443c122 ("V4L/DVB (12923): SAA7164: Add support for the NXP SAA7164 silicon") Signed-off-by: Liu Shixin <liushixin2@huawei.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent fbea21f commit da312cd

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,7 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
12271227

12281228
if (saa7164_dev_setup(dev) < 0) {
12291229
err = -EINVAL;
1230-
goto fail_free;
1230+
goto fail_dev;
12311231
}
12321232

12331233
/* print pci info */
@@ -1395,6 +1395,8 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
13951395

13961396
fail_irq:
13971397
saa7164_dev_unregister(dev);
1398+
fail_dev:
1399+
pci_disable_device(pci_dev);
13981400
fail_free:
13991401
v4l2_device_unregister(&dev->v4l2_dev);
14001402
kfree(dev);

0 commit comments

Comments
 (0)