diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-23 17:15:41 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-23 17:15:41 -0500 |
| commit | 9b7c84899ea6bfc4f8932a83b28db313e7397bd1 (patch) | |
| tree | 76af15f52485f95cf7c841e9994f6a9f99eab4b4 /drivers/net/wireless/hostap/hostap_pci.c | |
| parent | eff4b1fe0aa8002cbf414576e8cc102967bd9d5d (diff) | |
| parent | 4edac92fcf5956b0ef52fb281207863902e430bc (diff) | |
| download | linux-rt-9b7c84899ea6bfc4f8932a83b28db313e7397bd1.tar.gz | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_pci.c')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_pci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c index 2e85bdced2dd..194f07097581 100644 --- a/drivers/net/wireless/hostap/hostap_pci.c +++ b/drivers/net/wireless/hostap/hostap_pci.c @@ -307,7 +307,7 @@ static int prism2_pci_probe(struct pci_dev *pdev, memset(hw_priv, 0, sizeof(*hw_priv)); if (pci_enable_device(pdev)) - return -EIO; + goto err_out_free; phymem = pci_resource_start(pdev, 0); @@ -368,6 +368,8 @@ static int prism2_pci_probe(struct pci_dev *pdev, err_out_disable: pci_disable_device(pdev); prism2_free_local_data(dev); + + err_out_free: kfree(hw_priv); return -ENODEV; |