Commit 3db95e50 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by John W. Linville

mwl8k: don't forget to call pci_disable_device()

Don't forget to call pci_disable_device() if pci_request_regions()
fails during probe.
Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 89b872e2
...@@ -3378,7 +3378,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev, ...@@ -3378,7 +3378,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
if (rc) { if (rc) {
printk(KERN_ERR "%s: Cannot obtain PCI resources\n", printk(KERN_ERR "%s: Cannot obtain PCI resources\n",
MWL8K_NAME); MWL8K_NAME);
return rc; goto err_disable_device;
} }
pci_set_master(pdev); pci_set_master(pdev);
...@@ -3609,6 +3609,8 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev, ...@@ -3609,6 +3609,8 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
err_free_reg: err_free_reg:
pci_release_regions(pdev); pci_release_regions(pdev);
err_disable_device:
pci_disable_device(pdev); pci_disable_device(pdev);
return rc; return rc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment