xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next

Browse Source 
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

Conflicts:
	drivers/net/wireless/iwlwifi/mvm/mac80211.c
This commit is contained in:
Emmanuel Grumbach
2014-05-21 12:49:38 +03:00
parent 5344669989 7bacc78227
commit 0ccab3db2b
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/iwlwifi/mvm/mac80211.c
View File

@@ -1832,7 +1832,7 @@ static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw,
mutex_lock(&mvm->mutex);
if (iwl_mvm_is_associated(mvm)) {
if (!iwl_mvm_is_idle(mvm)) {
ret = -EBUSY;
goto out;
}