From 93d8d67f96bb2f1df6f8ef3008e6861452279ccd Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Mon, 27 Jul 2009 11:56:23 -0700
Subject: [PATCH] --- yaml --- r: 159338 b: refs/heads/master c:
 ebc8ab17d69cbaec6bb345a48a2cb87047643f63 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/wireless/at76c50x-usb.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index aa4a3bb5a46c..1b5082e9b30e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c94dbff7996b861fb0ff730bdf6eac4e2b288402
+refs/heads/master: ebc8ab17d69cbaec6bb345a48a2cb87047643f63
diff --git a/trunk/drivers/net/wireless/at76c50x-usb.c b/trunk/drivers/net/wireless/at76c50x-usb.c
index 13303fa34734..bbf5277aeef4 100644
--- a/trunk/drivers/net/wireless/at76c50x-usb.c
+++ b/trunk/drivers/net/wireless/at76c50x-usb.c
@@ -1773,6 +1773,8 @@ static void at76_mac80211_stop(struct ieee80211_hw *hw)
 
 	at76_dbg(DBG_MAC80211, "%s()", __func__);
 
+	cancel_work_sync(&priv->work_set_promisc);
+
 	mutex_lock(&priv->mtx);
 
 	if (!priv->device_unplugged) {