git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ath9k: fixup some merge damage
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
ath9k
/
core.c
diff --git
a/drivers/net/wireless/ath9k/core.c
b/drivers/net/wireless/ath9k/core.c
index
6c433a4
..
d7f5257
100644
(file)
--- 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);