diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-03-05 11:24:48 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-03-06 15:16:15 -0500 |
| commit | 7db5b989a0e28a40ce61ef0b26da1af18289d711 (patch) | |
| tree | 85406398bfcde2cbf399d5908c5a135beb5999fe /drivers | |
| parent | ab0bd5b32a9c7ea2e7cc69d56c82a96be340c269 (diff) | |
| download | linux-7db5b989a0e28a40ce61ef0b26da1af18289d711.tar.gz linux-7db5b989a0e28a40ce61ef0b26da1af18289d711.tar.bz2 linux-7db5b989a0e28a40ce61ef0b26da1af18289d711.zip | |
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')
| -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 6dd4faead7cd..c3b594647def 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) /*This will stop the queues, move the device to low power state */ iwl_trans_stop_device(trans(priv)); - iwl_dealloc_ucode(nic(priv)); - iwl_eeprom_free(priv->shrd); /*netif_stop_queue(dev); */ diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c index 76fc4407b19e..590f57662754 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) if (shrd->nic->op_mode) iwl_op_mode_stop(shrd->nic->op_mode); + iwl_dealloc_ucode(shrd->nic); + kfree(shrd->nic); } |