Commit 82e9f646 authored by Hamad Kadmany's avatar Hamad Kadmany Committed by Kalle Valo
Browse files

wil6210: fix sequence for scan-abort during reset 



Communication with FW must be done before wil->status
is initialized in order to properly handle cases where
communication with FW halts during reset sequence.

Signed-off-by: default avatarHamad Kadmany <qca_hkadmany@qca.qualcomm.com>
Signed-off-by: default avatarMaya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 62ca0690

drivers/net/wireless/ath/wil6210/main.c

+4 −4
Original line number Diff line number Diff line
@@ -948,15 +948,15 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) 
	/* Disable device led before reset*/

	wmi_led_cfg(wil, false);



	mutex_lock(&wil->p2p_wdev_mutex);

	wil_abort_scan(wil, false);

	mutex_unlock(&wil->p2p_wdev_mutex);



	/* prevent NAPI from being scheduled and prevent wmi commands */

	mutex_lock(&wil->wmi_mutex);

	bitmap_zero(wil->status, wil_status_last);

	mutex_unlock(&wil->wmi_mutex);



	mutex_lock(&wil->p2p_wdev_mutex);

	wil_abort_scan(wil, false);

	mutex_unlock(&wil->p2p_wdev_mutex);



	wil_mask_irq(wil);



	wmi_event_flush(wil);