diff options
| author |   David S. Miller <davem@davemloft.net> | 2008-03-26 16:09:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-26 16:09:43 -0700 |
| commit | 0e5606e4f46b7cf52dd445af01e71ed9dbb7f735 (patch) | |
| tree | b3a5e9a525de646bb353b2d9d5db305fdd3fd54e /drivers/net/wireless/b43/debugfs.c | |
| parent | [ICMP]: Dst entry leak in icmp_send host re-lookup code (v2). (diff) | |
| parent | b43: Remove irqs_disabled() sanity checks (diff) | |
| download | linux-dev-0e5606e4f46b7cf52dd445af01e71ed9dbb7f735.tar.xz linux-dev-0e5606e4f46b7cf52dd445af01e71ed9dbb7f735.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/b43/debugfs.c')
| -rw-r--r-- | drivers/net/wireless/b43/debugfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c index e38ed0fe72e9..7fca2ebc747f 100644 --- a/drivers/net/wireless/b43/debugfs.c +++ b/drivers/net/wireless/b43/debugfs.c @@ -618,6 +618,7 @@ void b43_debugfs_remove_device(struct b43_wldev *dev) kfree(e); } +/* Called with IRQs disabled. */ void b43_debugfs_log_txstat(struct b43_wldev *dev, const struct b43_txstatus *status) { @@ -629,8 +630,7 @@ void b43_debugfs_log_txstat(struct b43_wldev *dev, if (!e) return; log = &e->txstatlog; - B43_WARN_ON(!irqs_disabled()); - spin_lock(&log->lock); + spin_lock(&log->lock); /* IRQs are already disabled. */ i = log->end + 1; if (i == B43_NR_LOGGED_TXSTATUS) i = 0; |