1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 6d7cf3c2f7bf..66220cde9c49 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -856,22 +856,19 @@ static void b43_op_update_tkip_key(struct ieee80211_hw *hw,
         if (B43_WARN_ON(!modparam_hwtkip))
                 return;
 
-        mutex_lock(&wl->mutex);
-
+        /* This is only called from the RX path through mac80211, where
+         * our mutex is already locked. */
+        B43_WARN_ON(!mutex_is_locked(&wl->mutex));
         dev = wl->current_dev;
-        if (!dev || b43_status(dev) < B43_STAT_INITIALIZED)
-                goto out_unlock;
+        B43_WARN_ON(!dev || b43_status(dev) < B43_STAT_INITIALIZED);
 
         keymac_write(dev, index, NULL); /* First zero out mac to avoid race */
 
         rx_tkip_phase1_write(dev, index, iv32, phase1key);
         /* only pairwise TKIP keys are supported right now */
         if (WARN_ON(!sta))
-                goto out_unlock;
+                return;
         keymac_write(dev, index, sta->addr);
-
-out_unlock:
-        mutex_unlock(&wl->mutex);
 }
 
 static void do_key_write(struct b43_wldev *dev,