浏览代码

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>
Johannes Berg 13 年之前
父节点
当前提交
7db5b989a0
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 0 2
      drivers/net/wireless/iwlwifi/iwl-agn.c
  2. 2 0
      drivers/net/wireless/iwlwifi/iwl-drv.c

+ 0 - 2
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); */

+ 2 - 0
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);
 }