diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-03-05 14:24:48 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-06 15:16:15 -0500 |
commit | 7db5b989a0e28a40ce61ef0b26da1af18289d711 (patch) | |
tree | 85406398bfcde2cbf399d5908c5a135beb5999fe /drivers/net | |
parent | ab0bd5b32a9c7ea2e7cc69d56c82a96be340c269 (diff) |
iwlwifi: move uCode deallocation to drv
This shouldn't be in the op_mode, as it
will later be switchable at runtime.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-drv.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 6dd4faead7c..c3b594647de 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -1385,8 +1385,6 @@ static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode) | |||
1385 | /*This will stop the queues, move the device to low power state */ | 1385 | /*This will stop the queues, move the device to low power state */ |
1386 | iwl_trans_stop_device(trans(priv)); | 1386 | iwl_trans_stop_device(trans(priv)); |
1387 | 1387 | ||
1388 | iwl_dealloc_ucode(nic(priv)); | ||
1389 | |||
1390 | iwl_eeprom_free(priv->shrd); | 1388 | iwl_eeprom_free(priv->shrd); |
1391 | 1389 | ||
1392 | /*netif_stop_queue(dev); */ | 1390 | /*netif_stop_queue(dev); */ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c index 76fc4407b19..590f5766275 100644 --- a/drivers/net/wireless/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/iwlwifi/iwl-drv.c | |||
@@ -99,5 +99,7 @@ void iwl_drv_stop(struct iwl_shared *shrd) | |||
99 | if (shrd->nic->op_mode) | 99 | if (shrd->nic->op_mode) |
100 | iwl_op_mode_stop(shrd->nic->op_mode); | 100 | iwl_op_mode_stop(shrd->nic->op_mode); |
101 | 101 | ||
102 | iwl_dealloc_ucode(shrd->nic); | ||
103 | |||
102 | kfree(shrd->nic); | 104 | kfree(shrd->nic); |
103 | } | 105 | } |