diff options
author | Johannes Berg <johannes.berg@intel.com> | 2024-02-08 09:57:43 +0100 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2024-02-08 09:58:25 +0100 |
commit | af4acac7caa17cf10742c80e2dd859e21d06abb9 (patch) | |
tree | 650468891990d2f8edc6726aab697ff35d8b9673 /drivers/net/wireless/intel/iwlwifi/iwl-drv.c | |
parent | wifi: rtl8xxxu: update rate mask per sta (diff) | |
parent | wifi: mt76: mt7996: fix fortify warning (diff) | |
download | linux-af4acac7caa17cf10742c80e2dd859e21d06abb9.tar.xz linux-af4acac7caa17cf10742c80e2dd859e21d06abb9.zip |
Merge wireless into wireless-next
There are some changes coming to wireless-next that will
otherwise cause conflicts, pull wireless in first to be
able to resolve that when applying the individual changes
rather than having to do merge resolution later.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-drv.c')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index 8d562d0e87e4..91e974de0ade 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -128,6 +128,7 @@ static void iwl_dealloc_ucode(struct iwl_drv *drv) kfree(drv->fw.ucode_capa.cmd_versions); kfree(drv->fw.phy_integration_ver); kfree(drv->trans->dbg.pc_data); + drv->trans->dbg.pc_data = NULL; for (i = 0; i < IWL_UCODE_TYPE_MAX; i++) iwl_free_fw_img(drv, drv->fw.img + i); |