aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/assoc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/libertas/assoc.c')
-rw-r--r--drivers/net/wireless/libertas/assoc.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 54161f1e742a..fcea2a124a56 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -272,9 +272,7 @@ static int assoc_helper_wep_keys(struct lbs_private *priv,
272 else 272 else
273 priv->mac_control &= ~CMD_ACT_MAC_WEP_ENABLE; 273 priv->mac_control &= ~CMD_ACT_MAC_WEP_ENABLE;
274 274
275 ret = lbs_set_mac_control(priv); 275 lbs_set_mac_control(priv);
276 if (ret)
277 goto out;
278 276
279 mutex_lock(&priv->lock); 277 mutex_lock(&priv->lock);
280 278
@@ -304,9 +302,7 @@ static int assoc_helper_secinfo(struct lbs_private *priv,
304 memcpy(&priv->secinfo, &assoc_req->secinfo, 302 memcpy(&priv->secinfo, &assoc_req->secinfo,
305 sizeof(struct lbs_802_11_security)); 303 sizeof(struct lbs_802_11_security));
306 304
307 ret = lbs_set_mac_control(priv); 305 lbs_set_mac_control(priv);
308 if (ret)
309 goto out;
310 306
311 /* If RSN is already enabled, don't try to enable it again, since 307 /* If RSN is already enabled, don't try to enable it again, since
312 * ENABLE_RSN resets internal state machines and will clobber the 308 * ENABLE_RSN resets internal state machines and will clobber the