summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorLiu Shixin <liushixin2@huawei.com>2022-11-26 11:31:26 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-12-31 13:32:22 +0100
commit3872adf30623bd16fd7f2a77dfef4f4da1505b84 (patch)
tree2e9813098394db27c10a278a44da19006f40dc12 /drivers/media
parent809b48cb2eee2d9f5259eb79a22f9c725e9c6ed9 (diff)
downloadlinux-3872adf30623bd16fd7f2a77dfef4f4da1505b84.tar.gz
linux-3872adf30623bd16fd7f2a77dfef4f4da1505b84.tar.bz2
linux-3872adf30623bd16fd7f2a77dfef4f4da1505b84.zip
media: saa7164: fix missing pci_disable_device()
[ Upstream commit 57fb35d7542384cac8f198cd1c927540ad38b61a ] Add missing pci_disable_device() in the error path in saa7164_initdev(). Fixes: 443c1228d505 ("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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/pci/saa7164/saa7164-core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c
index d5f32e3ff544..754c8be1b6d8 100644
--- a/drivers/media/pci/saa7164/saa7164-core.c
+++ b/drivers/media/pci/saa7164/saa7164-core.c
@@ -1259,7 +1259,7 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
if (saa7164_dev_setup(dev) < 0) {
err = -EINVAL;
- goto fail_free;
+ goto fail_dev;
}
/* print pci info */
@@ -1427,6 +1427,8 @@ fail_fw:
fail_irq:
saa7164_dev_unregister(dev);
+fail_dev:
+ pci_disable_device(pci_dev);
fail_free:
v4l2_device_unregister(&dev->v4l2_dev);
kfree(dev);