diff --git a/[refs] b/[refs] index 537a94c9e50d..7c029984ff1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b64de35654cea2f5301d08f9195836f7ea8118c0 +refs/heads/master: 743b4518f9432e09ade6120ced414558969ba5fd diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c index 3795686f6e2a..364f7884a3d3 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -427,8 +427,10 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, if (sme->ie && (sme->ie_len > 0)) { status = ath6kl_set_assoc_req_ies(vif, sme->ie, sme->ie_len); - if (status) + if (status) { + up(&ar->sem); return status; + } } else ar->connect_ctrl_flags &= ~CONNECT_WPS_FLAG;