diff --git a/[refs] b/[refs] index ca26e7dc7366..f0506a5064fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89b872e2e476833cde8aaac658c75817f67e8f81 +refs/heads/master: 3db95e50c8813d8ed04a1ec7cd7b77dba7c81c80 diff --git a/trunk/drivers/net/wireless/mwl8k.c b/trunk/drivers/net/wireless/mwl8k.c index e59a92618807..76a6071aac8a 100644 --- a/trunk/drivers/net/wireless/mwl8k.c +++ b/trunk/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 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev, err_free_reg: pci_release_regions(pdev); + +err_disable_device: pci_disable_device(pdev); return rc;