diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-08 08:36:40 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-08 08:36:40 -0700 |
commit | 31e918908ccaf2b651ed8f666120f2a03a97193f (patch) | |
tree | 39aab36ced1932d06cb2e3cee037faae0b94a63b /drivers/net/wireless/ath/ath9k/link.c | |
parent | ae3759c2573031f1306496c6f9f32f20e86f03aa (diff) | |
parent | 31880c37c11e28cb81c70757e38392b42e695dc6 (diff) |
Merge 3.9-rc6 into usb-next
We want the fixes here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/link.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/link.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/link.c b/drivers/net/wireless/ath/ath9k/link.c index 39c84ecf6a42..7fdac6c7b3ea 100644 --- a/drivers/net/wireless/ath/ath9k/link.c +++ b/drivers/net/wireless/ath/ath9k/link.c @@ -170,7 +170,8 @@ void ath_rx_poll(unsigned long data) { struct ath_softc *sc = (struct ath_softc *)data; - ieee80211_queue_work(sc->hw, &sc->hw_check_work); + if (!test_bit(SC_OP_INVALID, &sc->sc_flags)) + ieee80211_queue_work(sc->hw, &sc->hw_check_work); } /* |