Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
index 456f32da6b26..c5b1d199e0bc 100644
--- a/drivers/net/wireless/iwlegacy/3945.c
+++ b/drivers/net/wireless/iwlegacy/3945.c
@@ -1855,11 +1855,12 @@ il3945_bg_reg_txpower_periodic(struct work_struct *work)
         struct il_priv *il = container_of(work, struct il_priv,
                                           _3945.thermal_periodic.work);
 
-        if (test_bit(S_EXIT_PENDING, &il->status))
-                return;
-
         mutex_lock(&il->mutex);
+        if (test_bit(S_EXIT_PENDING, &il->status) || il->txq == NULL)
+                goto out;
+
         il3945_reg_txpower_periodic(il);
+out:
         mutex_unlock(&il->mutex);
 }