summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/cw1200/sta.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/cw1200/sta.c b/drivers/staging/cw1200/sta.c
index 055d231fc01..47608bb5ed8 100644
--- a/drivers/staging/cw1200/sta.c
+++ b/drivers/staging/cw1200/sta.c
@@ -1166,13 +1166,14 @@ void cw1200_unjoin_work(struct work_struct *work)
mutex_lock(&priv->conf_mutex);
if (unlikely(atomic_read(&priv->scan.in_progress))) {
if (priv->delayed_unjoin) {
- wiphy_err(priv->hw->wiphy,
- "%s: Unexpected: delayed unjoin "
+ wiphy_dbg(priv->hw->wiphy,
+ "%s: Delayed unjoin "
"is already scheduled.\n",
__func__);
- BUG_ON(1);
+ wsm_unlock_tx(priv);
+ } else {
+ priv->delayed_unjoin = true;
}
- priv->delayed_unjoin = true;
mutex_unlock(&priv->conf_mutex);
return;
}