diff --git a/[refs] b/[refs] index 6a703cbed79a..11bd41fcf9de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 056508dcb6890586745aa937e779f00fde05531b +refs/heads/master: 9828b0170eef541c3fa583caa0134dadbb1d3ea6 diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index fb40428a5946..2d1d183ae6f0 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -1774,10 +1774,8 @@ void regulatory_hint_11d(struct wiphy *wiphy, mutex_lock(&cfg80211_mutex); - if (unlikely(!last_request)) { - mutex_unlock(&cfg80211_mutex); - return; - } + if (unlikely(!last_request)) + goto out; /* IE len must be evenly divisible by 2 */ if (country_ie_len & 0x01)