mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 10:58:48 +09:00
media: saa7164: fix missing pci_disable_device()
[ Upstream commit57fb35d754] Add missing pci_disable_device() in the error path in saa7164_initdev(). Fixes:443c1228d5("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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
46a9b31369
commit
7df1fbe49b
@@ -1270,7 +1270,7 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
|
|||||||
|
|
||||||
if (saa7164_dev_setup(dev) < 0) {
|
if (saa7164_dev_setup(dev) < 0) {
|
||||||
err = -EINVAL;
|
err = -EINVAL;
|
||||||
goto fail_free;
|
goto fail_dev;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* print pci info */
|
/* print pci info */
|
||||||
@@ -1438,6 +1438,8 @@ fail_fw:
|
|||||||
|
|
||||||
fail_irq:
|
fail_irq:
|
||||||
saa7164_dev_unregister(dev);
|
saa7164_dev_unregister(dev);
|
||||||
|
fail_dev:
|
||||||
|
pci_disable_device(pci_dev);
|
||||||
fail_free:
|
fail_free:
|
||||||
v4l2_device_unregister(&dev->v4l2_dev);
|
v4l2_device_unregister(&dev->v4l2_dev);
|
||||||
kfree(dev);
|
kfree(dev);
|
||||||
|
|||||||
Reference in New Issue
Block a user