Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 224354c0 authored by Pan Bian's avatar Pan Bian Committed by Greg Kroah-Hartman
Browse files

p54: drop device reference count if fails to enable device 



commit 8149069db81853570a665f5e5648c0e526dc0e43 upstream.

The function p54p_probe takes an extra reference count of the PCI
device. However, the extra reference count is not dropped when it fails
to enable the PCI device. This patch fixes the bug.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarPan Bian <bianpan2016@163.com>
Acked-by: default avatarChristian Lamparter <chunkeey@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 09abe5a6

drivers/net/wireless/intersil/p54/p54pci.c

+2 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static int p54p_probe(struct pci_dev *pdev, 
	err = pci_enable_device(pdev);

	if (err) {

		dev_err(&pdev->dev, "Cannot enable new PCI device\n");

		return err;

		goto err_put;

	}



	mem_addr = pci_resource_start(pdev, 0);
@@ -639,6 +639,7 @@ static int p54p_probe(struct pci_dev *pdev, 
	pci_release_regions(pdev);

 err_disable_dev:

	pci_disable_device(pdev);

err_put:

	pci_dev_put(pdev);

	return err;

}