diff options
author | John W. Linville <linville@tuxdriver.com> | 2008-10-06 16:16:38 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-06 16:16:38 -0400 |
commit | 8ec8ebaeceedf3a845f9e23885f26d0d00eefeb7 (patch) | |
tree | c1db9bf03204b34c46e251fd602f0708da6b3737 /drivers/net/wireless/ath9k | |
parent | c7004482e8dcb7c3c72666395cfa98a216a4fb70 (diff) |
ath9k: fixup some merge damage
This hunk was originally removed as part of "ath9k: Fix IRQ nobody cared
issue with ath9k".
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k')
-rw-r--r-- | drivers/net/wireless/ath9k/core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath9k/core.c b/drivers/net/wireless/ath9k/core.c index 6c433a4d003e..d7f5257d2ec1 100644 --- a/drivers/net/wireless/ath9k/core.c +++ b/drivers/net/wireless/ath9k/core.c | |||
@@ -288,8 +288,6 @@ static int ath_stop(struct ath_softc *sc) | |||
288 | * hardware is gone (invalid). | 288 | * hardware is gone (invalid). |
289 | */ | 289 | */ |
290 | 290 | ||
291 | if (!(sc->sc_flags & SC_OP_INVALID)) | ||
292 | ath9k_hw_set_interrupts(ah, 0); | ||
293 | ath_draintxq(sc, false); | 291 | ath_draintxq(sc, false); |
294 | if (!(sc->sc_flags & SC_OP_INVALID)) { | 292 | if (!(sc->sc_flags & SC_OP_INVALID)) { |
295 | ath_stoprecv(sc); | 293 | ath_stoprecv(sc); |