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
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
ath9k
/
main.c
diff --git
a/drivers/net/wireless/ath9k/main.c
b/drivers/net/wireless/ath9k/main.c
index
a2f5af6
..
8db75f6
100644
(file)
--- a/
drivers/net/wireless/ath9k/main.c
+++ b/
drivers/net/wireless/ath9k/main.c
@@
-1370,6
+1370,7
@@
static int ath_init(u16 devid, struct ath_softc *sc)
spin_lock_init(&sc->wiphy_lock);
spin_lock_init(&sc->sc_resetlock);
+ spin_lock_init(&sc->sc_serial_rw);
mutex_init(&sc->mutex);
tasklet_init(&sc->intr_tq, ath9k_tasklet, (unsigned long)sc);
tasklet_init(&sc->bcon_tasklet, ath_beacon_tasklet,