diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2008-05-29 04:35:25 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-06-03 15:00:26 -0400 |
commit | 261415f77a947a452dbd32a35186b2dc3ce14020 (patch) | |
tree | 5d80764efe439e36dd1d69d23377943798c06b5e /drivers/net/wireless | |
parent | 4d38c2e8ea7589f546244a1673b8171455283fcb (diff) |
iwlwifi: fix a memory leak in scan
This patch fixes a memory leak that the scan buffer isn't released
on exit.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index c9bbfbb8cfa0..61716ba90427 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -911,6 +911,7 @@ void iwl_uninit_drv(struct iwl_priv *priv) | |||
911 | iwl_free_calib_results(priv); | 911 | iwl_free_calib_results(priv); |
912 | iwlcore_free_geos(priv); | 912 | iwlcore_free_geos(priv); |
913 | iwl_free_channel_map(priv); | 913 | iwl_free_channel_map(priv); |
914 | kfree(priv->scan); | ||
914 | } | 915 | } |
915 | EXPORT_SYMBOL(iwl_uninit_drv); | 916 | EXPORT_SYMBOL(iwl_uninit_drv); |
916 | 917 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 244bfe5c751f..72279e07fe32 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -8257,7 +8257,7 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev) | |||
8257 | 8257 | ||
8258 | iwl3945_free_channel_map(priv); | 8258 | iwl3945_free_channel_map(priv); |
8259 | iwl3945_free_geos(priv); | 8259 | iwl3945_free_geos(priv); |
8260 | 8260 | kfree(priv->scan); | |
8261 | if (priv->ibss_beacon) | 8261 | if (priv->ibss_beacon) |
8262 | dev_kfree_skb(priv->ibss_beacon); | 8262 | dev_kfree_skb(priv->ibss_beacon); |
8263 | 8263 | ||