]>
Commit | Line | Data |
---|---|---|
7f85ba28 GKH |
1 | From 8149069db81853570a665f5e5648c0e526dc0e43 Mon Sep 17 00:00:00 2001 |
2 | From: Pan Bian <bianpan2016@163.com> | |
3 | Date: Wed, 17 Apr 2019 17:41:23 +0800 | |
4 | Subject: p54: drop device reference count if fails to enable device | |
5 | ||
6 | From: Pan Bian <bianpan2016@163.com> | |
7 | ||
8 | commit 8149069db81853570a665f5e5648c0e526dc0e43 upstream. | |
9 | ||
10 | The function p54p_probe takes an extra reference count of the PCI | |
11 | device. However, the extra reference count is not dropped when it fails | |
12 | to enable the PCI device. This patch fixes the bug. | |
13 | ||
14 | Cc: stable@vger.kernel.org | |
15 | Signed-off-by: Pan Bian <bianpan2016@163.com> | |
16 | Acked-by: Christian Lamparter <chunkeey@gmail.com> | |
17 | Signed-off-by: Kalle Valo <kvalo@codeaurora.org> | |
18 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
19 | ||
20 | --- | |
21 | drivers/net/wireless/intersil/p54/p54pci.c | 3 ++- | |
22 | 1 file changed, 2 insertions(+), 1 deletion(-) | |
23 | ||
24 | --- a/drivers/net/wireless/intersil/p54/p54pci.c | |
25 | +++ b/drivers/net/wireless/intersil/p54/p54pci.c | |
26 | @@ -554,7 +554,7 @@ static int p54p_probe(struct pci_dev *pd | |
27 | err = pci_enable_device(pdev); | |
28 | if (err) { | |
29 | dev_err(&pdev->dev, "Cannot enable new PCI device\n"); | |
30 | - return err; | |
31 | + goto err_put; | |
32 | } | |
33 | ||
34 | mem_addr = pci_resource_start(pdev, 0); | |
35 | @@ -639,6 +639,7 @@ static int p54p_probe(struct pci_dev *pd | |
36 | pci_release_regions(pdev); | |
37 | err_disable_dev: | |
38 | pci_disable_device(pdev); | |
39 | +err_put: | |
40 | pci_dev_put(pdev); | |
41 | return err; | |
42 | } |