Commit 04b08992 authored Sep 22, 2015 by Nicholas Krause Committed by Emmanuel Grumbach Dec 01, 2015

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>

parent f02d2ccd

drivers/net/wireless/intel/iwlwifi/mvm/scan.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1162,7 +1162,7 @@ static int iwl_mvm_check_running_scans(struct iwl_mvm *mvm, int type)
		case IWL_MVM_SCAN_SCHED:
		if (mvm->scan_status & IWL_MVM_SCAN_SCHED_MASK)
		return -EBUSY;
		iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_REGULAR, true);
		return iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_REGULAR, true);
		case IWL_MVM_SCAN_NETDETECT:
		/* No need to stop anything for net-detect since the
		* firmware is restarted anyway. This way, any sched