diff options
| author | Joerg Roedel <jroedel@suse.de> | 2022-05-20 12:26:49 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2022-05-20 12:26:49 +0200 |
| commit | b11deb2f250fbf841e578e0f3bea3993fdedd0f7 (patch) | |
| tree | da72b24f9948f4d5630529819b546e514a87aa61 /drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | |
| parent | e3b9bf145cb6a0c0ffa106d5a78029c7c3e94ef7 (diff) | |
| parent | 42226c989789d8da4af1de0c31070c96726d990c (diff) | |
Merge tag 'v5.18-rc7' into arm/smmu
Linux 5.18-rc7
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c index 866a33f49915..3237d4b528b5 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c @@ -371,7 +371,7 @@ void iwl_dbg_tlv_del_timers(struct iwl_trans *trans) struct iwl_dbg_tlv_timer_node *node, *tmp; list_for_each_entry_safe(node, tmp, timer_list, list) { - del_timer(&node->timer); + del_timer_sync(&node->timer); list_del(&node->list); kfree(node); } |