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>

diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c
index 8bbd092fbe1db70052857584f598c3d0192236f3..d0ad0f5ba035bc3f3a38ff5930d085acd03dda20 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164-core.c
+++ b/drivers/media/pci/saa7164/saa7164-core.c
@@ -1250,7 +1250,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 */
@@ -1422,6 +1422,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);