diff options
author | Nicholas Krause <xerofoify@gmail.com> | 2015-09-22 20:24:19 -0400 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-12-01 14:17:52 -0500 |
commit | 04b089922412ad3d0cee0046fd0cb495ef22b8e8 (patch) | |
tree | 35d5ca1bb86edfb2c5b2ce745f32303e190245e2 /drivers/net/wireless/intel/iwlwifi/mvm/scan.c | |
parent | f02d2ccd61638756b3b48db771ee419f6be7d011 (diff) |
iwlwifi: mvm: fix incorrect fallthrough in iwl_mvm_check_running_scans()
In the iwl_mvm_check_running_scans() we were mistakenly ignoring the
value returned by iwl_mvm_scan_stop() for scheduled scans and falling
thorugh to the next case, which caused us to always return zero.
Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
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 e8a79bff9c1b..7cbfb085f60b 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c | |||
@@ -1162,7 +1162,7 @@ static int iwl_mvm_check_running_scans(struct iwl_mvm *mvm, int type) | |||
1162 | case IWL_MVM_SCAN_SCHED: | 1162 | case IWL_MVM_SCAN_SCHED: |
1163 | if (mvm->scan_status & IWL_MVM_SCAN_SCHED_MASK) | 1163 | if (mvm->scan_status & IWL_MVM_SCAN_SCHED_MASK) |
1164 | return -EBUSY; | 1164 | return -EBUSY; |
1165 | iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_REGULAR, true); | 1165 | return iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_REGULAR, true); |
1166 | case IWL_MVM_SCAN_NETDETECT: | 1166 | case IWL_MVM_SCAN_NETDETECT: |
1167 | /* No need to stop anything for net-detect since the | 1167 | /* No need to stop anything for net-detect since the |
1168 | * firmware is restarted anyway. This way, any sched | 1168 | * firmware is restarted anyway. This way, any sched |