diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2009-11-30 18:13:34 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-07 22:51:21 +0100 |
| commit | 3db95e50c8813d8ed04a1ec7cd7b77dba7c81c80 (patch) | |
| tree | 3e23928f15578d9a3bb6e9dec0ad638151ce9a27 /drivers | |
| parent | mwl8k: increase firmware loading timeouts (diff) | |
| download | linux-3db95e50c8813d8ed04a1ec7cd7b77dba7c81c80.tar.xz linux-3db95e50c8813d8ed04a1ec7cd7b77dba7c81c80.zip | |
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 <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | 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 e59a92618807..76a6071aac8a 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; |