diff --git a/[refs] b/[refs] index 93915cb7c3ad..0b6e18c202bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 806a9e39670be4f1f861c346ec102a79e81b90c3 +refs/heads/master: d335fe6391c2d86582cf71ef5773a161ee604608 diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index d44f3b5481ad..b47445219a48 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -1261,11 +1261,13 @@ void regulatory_hint_11d(struct wiphy *wiphy, u32 checksum = 0; enum environment_cap env = ENVIRON_ANY; - if (!last_request) - return; - mutex_lock(&cfg80211_mutex); + if (unlikely(!last_request)) { + mutex_unlock(&cfg80211_mutex); + return; + } + /* IE len must be evenly divisible by 2 */ if (country_ie_len & 0x01) goto out;