diff options
author | David S. Miller <davem@davemloft.net> | 2009-10-13 12:55:20 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-13 12:55:20 -0700 |
commit | 421355de876b9f3fcc7e4cb6026e416fb12a5068 (patch) | |
tree | fb814456af86c75e1eb9e330994dda461fc5b4f7 /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
parent | aace495933a981274b6491d71b915165a61defdc (diff) | |
parent | 0fe7463a35aadfaf22d1ca58325ab3851b8d757c (diff) | |
download | op-kernel-dev-421355de876b9f3fcc7e4cb6026e416fb12a5068.zip op-kernel-dev-421355de876b9f3fcc7e4cb6026e416fb12a5068.tar.gz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index ecbe036..c347d66 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -4099,8 +4099,8 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e pci_set_drvdata(pdev, NULL); 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; } |