From b75d2c513ef5bdde1e337e4ff647a4ebab5e28ed Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 27 Jul 2009 11:56:24 -0700 Subject: [PATCH] --- yaml --- r: 159339 b: refs/heads/master c: 9ed21d390166ceb89e011d3dbd277475ff2f33c4 h: refs/heads/master i: 159337: 96e19189c8b25e44bd88d5569570b694cc1b1548 159335: 3dd4d5bae6e5ee3e78ee3ded5f33e7cf8cbd5dc4 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/at76c50x-usb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1b5082e9b30e..832d95ddb037 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebc8ab17d69cbaec6bb345a48a2cb87047643f63 +refs/heads/master: 9ed21d390166ceb89e011d3dbd277475ff2f33c4 diff --git a/trunk/drivers/net/wireless/at76c50x-usb.c b/trunk/drivers/net/wireless/at76c50x-usb.c index bbf5277aeef4..f46e2b33b1f9 100644 --- a/trunk/drivers/net/wireless/at76c50x-usb.c +++ b/trunk/drivers/net/wireless/at76c50x-usb.c @@ -1773,6 +1773,7 @@ static void at76_mac80211_stop(struct ieee80211_hw *hw) at76_dbg(DBG_MAC80211, "%s()", __func__); + cancel_delayed_work(&priv->dwork_hw_scan); cancel_work_sync(&priv->work_set_promisc); mutex_lock(&priv->mtx); @@ -2298,7 +2299,6 @@ static void at76_delete_device(struct at76_priv *priv) tasklet_kill(&priv->rx_tasklet); if (priv->mac80211_registered) { - cancel_delayed_work(&priv->dwork_hw_scan); flush_workqueue(priv->hw->workqueue); ieee80211_unregister_hw(priv->hw); }