diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-09 17:33:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-09 17:33:45 -0700 |
| commit | ea6a634ef7f0ab1d1f48ba0ad4f50e96d6065312 (patch) | |
| tree | fbf291540b824183e0d9292906e9570fd344ebaa /drivers/net/wireless/b43/sysfs.c | |
| parent | fa1a9c681377c57e233038e50479e7d7a5cc3108 (diff) | |
| parent | b2e3abdc708f8c0eff194af25362fdb239abe241 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43/sysfs.c')
| -rw-r--r-- | drivers/net/wireless/b43/sysfs.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/sysfs.c b/drivers/net/wireless/b43/sysfs.c index 5adaa3692d7..f1ae4e05a32 100644 --- a/drivers/net/wireless/b43/sysfs.c +++ b/drivers/net/wireless/b43/sysfs.c @@ -94,7 +94,6 @@ static ssize_t b43_attr_interfmode_store(struct device *dev, const char *buf, size_t count) { struct b43_wldev *wldev = dev_to_b43_wldev(dev); - unsigned long flags; int err; int mode; @@ -120,7 +119,6 @@ static ssize_t b43_attr_interfmode_store(struct device *dev, } mutex_lock(&wldev->wl->mutex); - spin_lock_irqsave(&wldev->wl->irq_lock, flags); if (wldev->phy.ops->interf_mitigation) { err = wldev->phy.ops->interf_mitigation(wldev, mode); @@ -132,7 +130,6 @@ static ssize_t b43_attr_interfmode_store(struct device *dev, err = -ENOSYS; mmiowb(); - spin_unlock_irqrestore(&wldev->wl->irq_lock, flags); mutex_unlock(&wldev->wl->mutex); return err ? err : count; |