Commit 4c483817 authored by Sujith's avatar Sujith Committed by John W. Linville

ath9k: Fix TX poll cancelling

In ath9k_stop(), tx_complete_work was being cancelled twice.
This patch fixes it. Also, locking sc->mutex should be done
at the beginning.
Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent bcd64e0c
...@@ -2105,6 +2105,8 @@ static void ath9k_stop(struct ieee80211_hw *hw) ...@@ -2105,6 +2105,8 @@ static void ath9k_stop(struct ieee80211_hw *hw)
struct ath_wiphy *aphy = hw->priv; struct ath_wiphy *aphy = hw->priv;
struct ath_softc *sc = aphy->sc; struct ath_softc *sc = aphy->sc;
mutex_lock(&sc->mutex);
aphy->state = ATH_WIPHY_INACTIVE; aphy->state = ATH_WIPHY_INACTIVE;
cancel_delayed_work_sync(&sc->ath_led_blink_work); cancel_delayed_work_sync(&sc->ath_led_blink_work);
...@@ -2117,13 +2119,10 @@ static void ath9k_stop(struct ieee80211_hw *hw) ...@@ -2117,13 +2119,10 @@ static void ath9k_stop(struct ieee80211_hw *hw)
if (sc->sc_flags & SC_OP_INVALID) { if (sc->sc_flags & SC_OP_INVALID) {
DPRINTF(sc, ATH_DBG_ANY, "Device not present\n"); DPRINTF(sc, ATH_DBG_ANY, "Device not present\n");
mutex_unlock(&sc->mutex);
return; return;
} }
mutex_lock(&sc->mutex);
cancel_delayed_work_sync(&sc->tx_complete_work);
if (ath9k_wiphy_started(sc)) { if (ath9k_wiphy_started(sc)) {
mutex_unlock(&sc->mutex); mutex_unlock(&sc->mutex);
return; /* another wiphy still in use */ return; /* another wiphy still in use */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment