[PATCH] bcm43xx: fix-up build breakage from merging patches out of order

Signed-off-by: John W. Linville <linville@tuxdriver.com>

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 634d3d8093cf..923275ea0789 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;