3 files changed, 4 insertions, 10 deletions

diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 87e145ffe8f1..4360deac943b 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -413,11 +413,10 @@ static int should_deauth_infrastructure(struct lbs_private *priv,
 {
         int ret = 0;
 
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
         if (priv->connect_status != LBS_CONNECTED)
                 return 0;
 
+        lbs_deb_enter(LBS_DEB_ASSOC);
         if (test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
                 lbs_deb_assoc("Deauthenticating due to new SSID\n");
                 ret = 1;
@@ -456,7 +455,7 @@ static int should_deauth_infrastructure(struct lbs_private *priv,
 
 out:
         lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return 0;
+        return ret;
 }
 
 
@@ -643,9 +642,7 @@ void lbs_association_worker(struct work_struct *work)
                 }
 
                 if (success) {
-                        lbs_deb_assoc("ASSOC: associated to '%s', %s\n",
-                                escape_essid(priv->curbssparams.ssid,
-                                             priv->curbssparams.ssid_len),
+                        lbs_deb_assoc("associated to %s\n",
                                 print_mac(mac, priv->curbssparams.bssid));
                         lbs_prepare_and_send_command(priv,
                                 CMD_802_11_RSSI,
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index bd2e6668d85f..a0a5dbe81b3b 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -74,7 +74,7 @@ void lbs_mac_event_disconnected(struct lbs_private *priv)
                 lbs_deb_cmd("disconnected, so exit PS mode\n");
                 lbs_ps_wakeup(priv, 0);
         }
-        lbs_deb_leave(LBS_DEB_CMD);
+        lbs_deb_leave(LBS_DEB_ASSOC);
 }
 
 /**
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index 2d4508048b68..a0a060939322 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -769,9 +769,6 @@ int lbs_ret_80211_associate(struct lbs_private *priv,
         priv->curbssparams.ssid_len = bss->ssid_len;
         memcpy(priv->curbssparams.bssid, bss->bssid, ETH_ALEN);
 
-        lbs_deb_assoc("ASSOC_RESP: currentpacketfilter is 0x%x\n",
-                priv->currentpacketfilter);
-
         priv->SNR[TYPE_RXPD][TYPE_AVG] = 0;
         priv->NF[TYPE_RXPD][TYPE_AVG] = 0;