diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-17 22:29:22 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-17 22:29:22 +0100 |
| commit | f10023a4ef3f5cc05457b059c6880bc447adfa1f (patch) | |
| tree | e5d229bb9719b0be27289a6736d2e22254da06f0 /drivers/net/wireless/ath9k/main.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/... (diff) | |
| parent | zd1211rw: Do not panic on device eject when associated (diff) | |
| download | linux-f10023a4ef3f5cc05457b059c6880bc447adfa1f.tar.xz linux-f10023a4ef3f5cc05457b059c6880bc447adfa1f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath9k/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index 0e80990d8e84..3c04044a60bd 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c @@ -1336,6 +1336,7 @@ static int ath_init(u16 devid, struct ath_softc *sc) printk(KERN_ERR "Unable to create debugfs files\n"); 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, ath9k_beacon_tasklet, |