diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-13 15:55:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-13 15:55:20 -0400 |
| commit | 421355de876b9f3fcc7e4cb6026e416fb12a5068 (patch) | |
| tree | fb814456af86c75e1eb9e330994dda461fc5b4f7 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | aace495933a981274b6491d71b915165a61defdc (diff) | |
| parent | 0fe7463a35aadfaf22d1ca58325ab3851b8d757c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 046b571fd9ce..8d7bc38fe005 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
| @@ -3156,8 +3156,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 3156 | out_pci_disable_device: | 3156 | out_pci_disable_device: |
| 3157 | pci_disable_device(pdev); | 3157 | pci_disable_device(pdev); |
| 3158 | out_ieee80211_free_hw: | 3158 | out_ieee80211_free_hw: |
| 3159 | ieee80211_free_hw(priv->hw); | ||
| 3160 | iwl_free_traffic_mem(priv); | 3159 | iwl_free_traffic_mem(priv); |
| 3160 | ieee80211_free_hw(priv->hw); | ||
| 3161 | out: | 3161 | out: |
| 3162 | return err; | 3162 | return err; |
| 3163 | } | 3163 | } |