From 241b167d8a3863666fefeb2f1d2438372a8febd2 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 24 Jul 2009 20:47:33 -0400 Subject: [PATCH] --- yaml --- r: 159429 b: refs/heads/master c: e48e3a2f17f189deb086ff221e489e7fd8ec4302 h: refs/heads/master i: 159427: 3dc3c6e633d52aef32b0c42fe3d09351a08308e0 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/main.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6b86b1c4a5c8..ea0084bdc6ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7e7d229c7d1395283e1e1fda8727af60ca6f4ad +refs/heads/master: e48e3a2f17f189deb086ff221e489e7fd8ec4302 diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c index 7f412dd9b9fb..a9e43f7a23f6 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/main.c +++ b/trunk/drivers/net/wireless/ath/ath9k/main.c @@ -2117,6 +2117,8 @@ static void ath9k_stop(struct ieee80211_hw *hw) mutex_lock(&sc->mutex); + cancel_delayed_work_sync(&sc->tx_complete_work); + if (ath9k_wiphy_started(sc)) { mutex_unlock(&sc->mutex); return; /* another wiphy still in use */