Commit 3e99ac9c authored Sep 21, 2017 by Christophe JAILLET Committed by Greg Kroah-Hartman Mar 24, 2018

media: bt8xx: Fix err 'bt878_probe()'




[ Upstream commit 45392ff6881dbe56d41ef0b17c2e576065f8ffa1 ]

This is odd to call 'pci_disable_device()' in an error path before a
coresponding successful 'pci_enable_device()'.

Return directly instead.

Fixes: 77e0be12 ("V4L/DVB (4176): Bug-fix: Fix memory overflow")

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent f5ef6dc4

drivers/media/pci/bt8xx/bt878.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -422,8 +422,7 @@ static int bt878_probe(struct pci_dev dev, const struct pci_device_id pci_id)
		bt878_num);
		if (bt878_num >= BT878_MAX) {
		printk(KERN_ERR "bt878: Too many devices inserted\n");
		result = -ENOMEM;
		goto fail0;
		return -ENOMEM;
		}
		if (pci_enable_device(dev))
		return -EIO;