From a7c1b6b61f53c556e4a935eb060244d64e0b8fba Mon Sep 17 00:00:00 2001 From: Vladimir Kondratiev Date: Mon, 28 Jan 2013 18:31:05 +0200 Subject: [PATCH] --- yaml --- r: 352322 b: refs/heads/master c: e08b5906ccf323e2ad7b0448329b7cbcfda4c94e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/wil6210/main.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8fc6e21b2c5a..dbff9617fb78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56f004b4672972b6c936573eca835ed90787097a +refs/heads/master: e08b5906ccf323e2ad7b0448329b7cbcfda4c94e diff --git a/trunk/drivers/net/wireless/ath/wil6210/main.c b/trunk/drivers/net/wireless/ath/wil6210/main.c index 4c1533088fe5..aa598f37899b 100644 --- a/trunk/drivers/net/wireless/ath/wil6210/main.c +++ b/trunk/drivers/net/wireless/ath/wil6210/main.c @@ -250,13 +250,13 @@ int wil_reset(struct wil6210_priv *wil) cancel_work_sync(&wil->disconnect_worker); wil6210_disconnect(wil, NULL); + wil6210_disable_irq(wil); + wil->status = 0; + wmi_event_flush(wil); - flush_workqueue(wil->wmi_wq); flush_workqueue(wil->wmi_wq_conn); - - wil6210_disable_irq(wil); - wil->status = 0; + flush_workqueue(wil->wmi_wq); /* TODO: put MAC in reset */ wil_target_reset(wil);