diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-10-09 14:11:30 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-10-09 14:11:30 +0200 |
commit | 545633f6fecd240bfa50bb8e2db627eac76f9f8a (patch) | |
tree | 7b68d3d5d49e352c5d1eaecd5e0958db89bda09a /drivers/net/wireless/intel/iwlwifi/mvm/scan.c | |
parent | 3a9fce327ff9cabf7f89d3f20616a83af28393da (diff) | |
parent | 5803b023881857db32ffefa0d269c90280a67ee0 (diff) |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/scan.c')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index 50983615dce6..774122fed454 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -555,7 +555,7 @@ static int iwl_mvm_lmac_scan_abort(struct iwl_mvm *mvm) struct iwl_host_cmd cmd = { .id = SCAN_OFFLOAD_ABORT_CMD, }; - u32 status; + u32 status = CAN_ABORT_STATUS; ret = iwl_mvm_send_cmd_status(mvm, &cmd, &status); if (ret) |