diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2009-11-30 12:13:34 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-12-07 16:51:21 -0500 |
commit | 3db95e50c8813d8ed04a1ec7cd7b77dba7c81c80 (patch) | |
tree | 3e23928f15578d9a3bb6e9dec0ad638151ce9a27 /drivers | |
parent | 89b872e2e476833cde8aaac658c75817f67e8f81 (diff) |
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, | |||
3378 | if (rc) { | 3378 | if (rc) { |
3379 | printk(KERN_ERR "%s: Cannot obtain PCI resources\n", | 3379 | printk(KERN_ERR "%s: Cannot obtain PCI resources\n", |
3380 | MWL8K_NAME); | 3380 | MWL8K_NAME); |
3381 | return rc; | 3381 | goto err_disable_device; |
3382 | } | 3382 | } |
3383 | 3383 | ||
3384 | pci_set_master(pdev); | 3384 | pci_set_master(pdev); |
@@ -3609,6 +3609,8 @@ err_iounmap: | |||
3609 | 3609 | ||
3610 | err_free_reg: | 3610 | err_free_reg: |
3611 | pci_release_regions(pdev); | 3611 | pci_release_regions(pdev); |
3612 | |||
3613 | err_disable_device: | ||
3612 | pci_disable_device(pdev); | 3614 | pci_disable_device(pdev); |
3613 | 3615 | ||
3614 | return rc; | 3616 | return rc; |