diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 18:10:00 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 18:24:54 -0400 |
| commit | f1207ba1a756610a9880fe4b70d7f0e9f0627073 (patch) | |
| tree | f6840b54e05cbffb70e64e9646245b0068217b03 /drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | |
| parent | 27be44ff8ee29e945adad226cc360c9278239d17 (diff) | |
| download | op-kernel-dev-f1207ba1a756610a9880fe4b70d7f0e9f0627073.zip op-kernel-dev-f1207ba1a756610a9880fe4b70d7f0e9f0627073.tar.gz | |
[PATCH] bcm43xx: fix-up build breakage from merging patches out of order
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c index 634d3d8..923275e 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c @@ -331,7 +331,8 @@ static ssize_t restart_write_file(struct file *file, const char __user *user_buf res = -EFAULT; goto out_up; } - bcm43xx_lock_irqsafe(bcm, flags); + mutex_lock(&(bcm)->mutex); + spin_lock_irqsave(&(bcm)->irq_lock, flags); if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) { printk(KERN_INFO PFX "debugfs: Board not initialized.\n"); res = -EFAULT; @@ -344,7 +345,8 @@ static ssize_t restart_write_file(struct file *file, const char __user *user_buf res = -EINVAL; out_unlock: - bcm43xx_unlock_irqsafe(bcm, flags); + spin_unlock_irqrestore(&(bcm)->irq_lock, flags); + mutex_unlock(&(bcm)->mutex); out_up: up(&big_buffer_sem); return res; |
