1 files changed, 13 insertions, 8 deletions

diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c
index cc7ebcee60e..5bdcc36f543 100644
--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
@@ -2748,11 +2748,12 @@ static void iwl3945_bg_init_alive_start(struct work_struct *data)
         struct iwl_priv *priv =
             container_of(data, struct iwl_priv, init_alive_start.work);
 
+        mutex_lock(&priv->mutex);
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
+                goto out;
 
-        mutex_lock(&priv->mutex);
         iwl3945_init_alive_start(priv);
+out:
         mutex_unlock(&priv->mutex);
 }
 
@@ -2761,11 +2762,12 @@ static void iwl3945_bg_alive_start(struct work_struct *data)
         struct iwl_priv *priv =
             container_of(data, struct iwl_priv, alive_start.work);
 
+        mutex_lock(&priv->mutex);
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
+                goto out;
 
-        mutex_lock(&priv->mutex);
         iwl3945_alive_start(priv);
+out:
         mutex_unlock(&priv->mutex);
 }
 
@@ -2995,10 +2997,12 @@ static void iwl3945_bg_restart(struct work_struct *data)
         } else {
                 iwl3945_down(priv);
 
-                if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+                mutex_lock(&priv->mutex);
+                if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
+                        mutex_unlock(&priv->mutex);
                         return;
+                }
 
-                mutex_lock(&priv->mutex);
                 __iwl3945_up(priv);
                 mutex_unlock(&priv->mutex);
         }
@@ -3009,11 +3013,12 @@ static void iwl3945_bg_rx_replenish(struct work_struct *data)
         struct iwl_priv *priv =
             container_of(data, struct iwl_priv, rx_replenish);
 
+        mutex_lock(&priv->mutex);
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
+                goto out;
 
-        mutex_lock(&priv->mutex);
         iwl3945_rx_replenish(priv);
+out:
         mutex_unlock(&priv->mutex);
 }