diff options
author | David S. Miller <davem@davemloft.net> | 2009-10-13 11:41:34 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-13 11:41:34 -0700 |
commit | 417c5233dbe35ffd6fa9e53754773f73690e1ce3 (patch) | |
tree | 1cfcbeddd1f91d5811de67dcb86f060d194ad6f5 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
parent | 91cd1756cbbe9ba8772e6a5908f20cee56019c0d (diff) | |
parent | c49de94a56f02768fa881cd7cbf58907910ceb8e (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-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 cdc07c47745..9b5ea8ba721 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -3105,8 +3105,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) out_pci_disable_device: pci_disable_device(pdev); out_ieee80211_free_hw: - ieee80211_free_hw(priv->hw); iwl_free_traffic_mem(priv); + ieee80211_free_hw(priv->hw); out: return err; } |