From: Luis R. Rodriguez Date: Mon, 27 Jul 2009 18:56:23 +0000 (-0700) Subject: ar76c50x-usb: cancel promisc work during mac80211 stop X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ebc8ab17d69cbaec6bb345a48a2cb87047643f63;p=deliverable%2Flinux.git ar76c50x-usb: cancel promisc work during mac80211 stop We weren't ever cancelling this. Signed-off-by: Luis R. Rodriguez Acked-by: Kalle Valo Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index 13303fa34734..bbf5277aeef4 100644 --- a/drivers/net/wireless/at76c50x-usb.c +++ b/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) {