diff options
| author | Ben Greear <greearb@candelatech.com> | 2010-10-15 22:51:32 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-25 18:43:13 (GMT) |
| commit | 9192f715bc6304b97fe06c6215d4897a5c279e81 (patch) | |
| tree | 34ff239dba9005389754f8eeea2550680a101468 | |
| parent | 20b25744d1366762c6878d3254f93973cafe1f8e (diff) | |
| download | linux-9192f715bc6304b97fe06c6215d4897a5c279e81.tar.xz | |
ath5k: Properly initialize ath_common->cc_lock.
Otherwise, lockdep splats, at the least:
INFO: trying to register non-static key.
the code is fine but needs lockdep annotation.
turning off the locking correctness validator.
Pid: 0, comm: swapper Not tainted 2.6.36-rc8-wl+ #32
Call Trace:
[<c075d940>] ? printk+0xf/0x17
[<c045507a>] register_lock_class+0x5a/0x29e
[<c0456af5>] __lock_acquire+0xa2/0xb8c
[<c0455be2>] ? mark_lock+0x1e/0x1de
[<c041a540>] ? acpi_get_override_irq+0x85/0x8c
[<c0455536>] ? trace_hardirqs_off+0xb/0xd
[<c0457639>] lock_acquire+0x5a/0x78
[<f8126835>] ? ath5k_ani_calibration+0x24/0x52b [ath5k]
[<c075f6ed>] _raw_spin_lock_bh+0x20/0x2f
[<f8126835>] ? ath5k_ani_calibration+0x24/0x52b [ath5k]
[<f8126835>] ath5k_ani_calibration+0x24/0x52b [ath5k]
[<c0438f99>] ? tasklet_action+0x3b/0xc6
[<f8123c2b>] ath5k_tasklet_ani+0x18/0x22 [ath5k]
[<c0438fd1>] tasklet_action+0x73/0xc6
[<c043945f>] __do_softirq+0x86/0x111
[<c0439520>] do_softirq+0x36/0x5a
[<c0439659>] irq_exit+0x35/0x69
[<c0403fb9>] do_IRQ+0x86/0x9a
[<c04034ee>] common_interrupt+0x2e/0x40
[<c045007b>] ? do_adjtimex+0x223/0x55e
[<c0408245>] ? mwait_idle+0x5c/0x6c
[<c040227f>] cpu_idle+0x4e/0x6b
[<c074b6e9>] rest_init+0x8d/0x92
[<c09758ea>] start_kernel+0x320/0x325
[<c09750d0>] i386_start_kernel+0xd0/0xd7
Signed-off-by: Ben Greear <greearb@candelatech.com>
Acked-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index f1ae75d..8251946 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -3580,6 +3580,7 @@ ath5k_pci_probe(struct pci_dev *pdev, common->ah = sc->ah; common->hw = hw; common->cachelsz = csz << 2; /* convert to bytes */ + spin_lock_init(&common->cc_lock); /* Initialize device */ ret = ath5k_hw_attach(sc); |