---

yaml --- r: 159335 b: refs/heads/master c: 9851bad h: refs/heads/master i: 159333: 20cd566 159331: ab6e972 159327: da85d4c v: v3
git-mirror · Aug 4, 2009 · 3dd4d5b · 3dd4d5b
1 parent 677ce90
commit 3dd4d5b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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];