2009-11-30 17:13:28

by Lennert Buytenhek

[permalink] [raw]
Subject: [PATCH 09/12] 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: Lennert Buytenhek <[email protected]>
---
drivers/net/wireless/mwl8k.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index b3eba35..5e67ae9 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -3378,7 +3378,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
if (rc) {
printk(KERN_ERR "%s: Cannot obtain PCI resources\n",
MWL8K_NAME);
- return rc;
+ goto err_disable_device;
}

pci_set_master(pdev);
@@ -3609,6 +3609,8 @@ err_iounmap:

err_free_reg:
pci_release_regions(pdev);
+
+err_disable_device:
pci_disable_device(pdev);

return rc;
--
1.5.6.4