summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath10k
diff options
context:
space:
mode:
authorMichal Kazior <michal.kazior@tieto.com>2013-07-05 16:15:16 +0300
committerKalle Valo <kvalo@qca.qualcomm.com>2013-07-30 18:01:18 +0300
commitadb8c9b77cd182b1b3f2b145b8db4043623e3745 (patch)
treef2a2ef1e6743b0c03b71c657ecabfe18d4b7a130 /drivers/net/wireless/ath/ath10k
parent548db54cc1890b161e87d4ca1028cf77f51fd16c (diff)
downloadblackbird-op-linux-adb8c9b77cd182b1b3f2b145b8db4043623e3745.tar.gz
blackbird-op-linux-adb8c9b77cd182b1b3f2b145b8db4043623e3745.zip
ath10k: abort scan properly if wmi_scan_stop fails
Signed-off-by: Michal Kazior <michal.kazior@tieto.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath10k')
-rw-r--r--drivers/net/wireless/ath/ath10k/mac.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 278c9689ce7a..50825030bb17 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -1590,6 +1590,10 @@ static int ath10k_abort_scan(struct ath10k *ar)
ret = ath10k_wmi_stop_scan(ar, &arg);
if (ret) {
ath10k_warn("could not submit wmi stop scan (%d)\n", ret);
+ spin_lock_bh(&ar->data_lock);
+ ar->scan.in_progress = false;
+ ath10k_offchan_tx_purge(ar);
+ spin_unlock_bh(&ar->data_lock);
return -EIO;
}
OpenPOWER on IntegriCloud