Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27e69bfe authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wil6210: fix sequence for scan-abort during reset" into msm-4.9

parents 5da7d23c 8fc4c485

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

+4 −4
Original line number Diff line number Diff line
@@ -953,15 +953,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);