From 3dd4d5bae6e5ee3e78ee3ded5f33e7cf8cbd5dc4 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 27 Jul 2009 11:53:02 -0700 Subject: [PATCH] --- yaml --- r: 159335 b: refs/heads/master c: 9851bad7a3ab601b8b5b156119a7d0fd15b47fa3 h: refs/heads/master i: 159333: 20cd566414ec91f6c924971cdf83463e8867401f 159331: ab6e972b5932854374d08660cd767a27a1fc9ab3 159327: da85d4cd5c4a253e4d3bedfc0263b0c71385c8b1 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3da159bb9307..bd9759c1fcd7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4da163ab0a224590f3cae67c1d54ae8c428f6223 +refs/heads/master: 9851bad7a3ab601b8b5b156119a7d0fd15b47fa3 diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c index 75ddb2acb644..49f27648fec8 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/main.c +++ b/trunk/drivers/net/wireless/ath/ath9k/main.c @@ -1252,9 +1252,9 @@ void ath_detach(struct ath_softc *sc) DPRINTF(sc, ATH_DBG_CONFIG, "Detach ATH hw\n"); ath_deinit_leds(sc); - cancel_work_sync(&sc->chan_work); - cancel_delayed_work_sync(&sc->wiphy_work); cancel_delayed_work_sync(&sc->tx_complete_work); + cancel_delayed_work_sync(&sc->wiphy_work); + cancel_work_sync(&sc->chan_work); for (i = 0; i < sc->num_sec_wiphy; i++) { struct ath_wiphy *aphy = sc->sec_wiphy[i];