diff options
author | Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> | 2013-01-28 11:31:05 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-01-30 15:07:16 -0500 |
commit | e08b5906ccf323e2ad7b0448329b7cbcfda4c94e (patch) | |
tree | 4f1f1ad792045e005a2e12b0f92869a1d199c17e /drivers | |
parent | 56f004b4672972b6c936573eca835ed90787097a (diff) |
wil6210: Reorder reset preparation sequence
Disable interrupts first to prevent spurious WMI events arrival
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/wil6210/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c index 4c1533088fe5..aa598f37899b 100644 --- a/drivers/net/wireless/ath/wil6210/main.c +++ b/drivers/net/wireless/ath/wil6210/main.c | |||
@@ -250,13 +250,13 @@ int wil_reset(struct wil6210_priv *wil) | |||
250 | cancel_work_sync(&wil->disconnect_worker); | 250 | cancel_work_sync(&wil->disconnect_worker); |
251 | wil6210_disconnect(wil, NULL); | 251 | wil6210_disconnect(wil, NULL); |
252 | 252 | ||
253 | wil6210_disable_irq(wil); | ||
254 | wil->status = 0; | ||
255 | |||
253 | wmi_event_flush(wil); | 256 | wmi_event_flush(wil); |
254 | 257 | ||
255 | flush_workqueue(wil->wmi_wq); | ||
256 | flush_workqueue(wil->wmi_wq_conn); | 258 | flush_workqueue(wil->wmi_wq_conn); |
257 | 259 | flush_workqueue(wil->wmi_wq); | |
258 | wil6210_disable_irq(wil); | ||
259 | wil->status = 0; | ||
260 | 260 | ||
261 | /* TODO: put MAC in reset */ | 261 | /* TODO: put MAC in reset */ |
262 | wil_target_reset(wil); | 262 | wil_target_reset(wil); |