diff --git a/[refs] b/[refs] index ad3020681bf1..cc0e8458188c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17e72782f02fe732d687e5bc2bb0ce10424d2819 +refs/heads/master: 322a9811a3ac1db7ddd11c959e8d9e438e97e8e6 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c index 7e3e5bfed681..ed5e625fe4e5 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -6339,10 +6339,9 @@ static void iwl3945_post_associate(struct iwl3945_priv *priv) if (test_bit(STATUS_EXIT_PENDING, &priv->status)) return; - if (!priv->vif || !priv->is_open) { - mutex_unlock(&priv->mutex); + if (!priv->vif || !priv->is_open) return; - } + iwl3945_scan_cancel_timeout(priv, 200); conf = ieee80211_get_hw_conf(priv->hw);