diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-10 08:04:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-10 08:04:16 -0400 |
| commit | d5df2a16133f4eb22f9a6bbc07723443568d362f (patch) | |
| tree | 7135c9054db234feec6001c6d938a715b29e2370 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | d4a4aba61731ce6d102a6a93e22b8fa26511c9d5 (diff) | |
| parent | db434ac6bff0d991d0b60166dc9d6405b873d0f7 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x_main.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/rt2x00/rt73usb.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 31e64bd96d1e..7902d22da663 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
| @@ -3482,8 +3482,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 3482 | out_iounmap: | 3482 | out_iounmap: |
| 3483 | pci_iounmap(pdev, priv->hw_base); | 3483 | pci_iounmap(pdev, priv->hw_base); |
| 3484 | out_pci_release_regions: | 3484 | out_pci_release_regions: |
| 3485 | pci_release_regions(pdev); | ||
| 3486 | pci_set_drvdata(pdev, NULL); | 3485 | pci_set_drvdata(pdev, NULL); |
| 3486 | pci_release_regions(pdev); | ||
| 3487 | out_pci_disable_device: | 3487 | out_pci_disable_device: |
| 3488 | pci_disable_device(pdev); | 3488 | pci_disable_device(pdev); |
| 3489 | out_ieee80211_free_hw: | 3489 | out_ieee80211_free_hw: |