From: John W. Linville Date: Mon, 6 Oct 2008 20:16:38 +0000 (-0400) Subject: ath9k: fixup some merge damage X-Git-Tag: MMI-PSA29.97-13-9~31818^2~110^2~18 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8ec8ebaeceedf3a845f9e23885f26d0d00eefeb7;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 --- 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) * hardware is gone (invalid). */ - if (!(sc->sc_flags & SC_OP_INVALID)) - ath9k_hw_set_interrupts(ah, 0); ath_draintxq(sc, false); if (!(sc->sc_flags & SC_OP_INVALID)) { ath_stoprecv(sc);