From ffd485ea4bccf2ccc8a81119e89fea1ee093691d Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@web.de>
Date: Sat, 28 Mar 2009 01:46:14 +0100
Subject: [PATCH] --- yaml --- r: 149844 b: refs/heads/master c:
 32c1628f153a5468cf48be5e5c04cd599ae9e01d h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/wireless/ar9170/main.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1ca6d718f429..03f3cf6c64aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 807e37394b5a1dc23a2908b59f34edbbae67e9ea
+refs/heads/master: 32c1628f153a5468cf48be5e5c04cd599ae9e01d
diff --git a/trunk/drivers/net/wireless/ar9170/main.c b/trunk/drivers/net/wireless/ar9170/main.c
index 5996ff9f7f47..5f55754d968f 100644
--- a/trunk/drivers/net/wireless/ar9170/main.c
+++ b/trunk/drivers/net/wireless/ar9170/main.c
@@ -742,8 +742,9 @@ static void ar9170_op_stop(struct ieee80211_hw *hw)
 	if (IS_STARTED(ar))
 		ar->state = AR9170_IDLE;
 
-	mutex_lock(&ar->mutex);
+	flush_workqueue(ar->hw->workqueue);
 
+	mutex_lock(&ar->mutex);
 	cancel_delayed_work_sync(&ar->tx_status_janitor);
 	cancel_work_sync(&ar->filter_config_work);
 	cancel_work_sync(&ar->beacon_work);
@@ -1123,10 +1124,10 @@ static void ar9170_set_filters(struct work_struct *work)
 					 filter_config_work);
 	int err;
 
-	mutex_lock(&ar->mutex);
 	if (unlikely(!IS_STARTED(ar)))
-		goto unlock;
+		return ;
 
+	mutex_lock(&ar->mutex);
 	if (ar->filter_changed & AR9170_FILTER_CHANGED_PROMISC) {
 		err = ar9170_set_operating_mode(ar);
 		if (err)