Skip to content

Commit

Permalink
iwlwifi: move uCode deallocation to drv
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Berg authored and John W. Linville committed Mar 6, 2012
1 parent ab0bd5b commit 7db5b98
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 0 additions & 2 deletions drivers/net/wireless/iwlwifi/iwl-agn.c
Original file line number Diff line number Diff line change
Expand Up @@ -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); */
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/wireless/iwlwifi/iwl-drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

0 comments on commit 7db5b98

Please sign in to comment.