p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iwlwifi: mvm: fix uninitialized var while waiting for queues to empty 

While waiting for queues to empty,
If txq_id == IWL_MVM_INVALID_QUEUE for all txq_ids,
ret is used uninitialized.
Found by Klocwork.

Fixes: d6d517b773 ("iwlwifi: add wait for tx queue empty")
Signed-off-by: Sharon Dvir <sharon.dvir@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Sharon Dvir 2017-06-12 11:40:33 +03:00 committed by Luca Coelho
parent cf6c6ea352
commit bec9522aa5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
View File

@ -1619,10 +1619,11 @@ static void iwl_mvm_disable_sta_queues(struct iwl_mvm *mvm,
int iwl_mvm_wait_sta_queues_empty(struct iwl_mvm *mvm, int iwl_mvm_wait_sta_queues_empty(struct iwl_mvm *mvm,
struct iwl_mvm_sta *mvm_sta) struct iwl_mvm_sta *mvm_sta)
{ {
int i, ret; int i;
for (i = 0; i < ARRAY_SIZE(mvm_sta->tid_data); i++) { for (i = 0; i < ARRAY_SIZE(mvm_sta->tid_data); i++) {
u16 txq_id; u16 txq_id;
int ret;
spin_lock_bh(&mvm_sta->lock); spin_lock_bh(&mvm_sta->lock);
txq_id = mvm_sta->tid_data[i].txq_id; txq_id = mvm_sta->tid_data[i].txq_id;
@ -1633,10 +1634,10 @@ int iwl_mvm_wait_sta_queues_empty(struct iwl_mvm *mvm,
ret = iwl_trans_wait_txq_empty(mvm->trans, txq_id); ret = iwl_trans_wait_txq_empty(mvm->trans, txq_id);
if (ret) if (ret)
break; return ret;
} }
return ret; return 0;
} }
int iwl_mvm_rm_sta(struct iwl_mvm *mvm, int iwl_mvm_rm_sta(struct iwl_mvm *mvm,