From 3e4db04a6e7cf5845a6eb23376d82520bb4d0c81 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 30 Jul 2009 17:38:06 -0700 Subject: [PATCH] --- yaml --- r: 159375 b: refs/heads/master c: 9828b0170eef541c3fa583caa0134dadbb1d3ea6 h: refs/heads/master i: 159373: b7c93ffaece1e513f3494e40c1385507b3adcd4a 159371: 15bd5c986b1b24ce0698de4ca2d051abeae96782 159367: 8a5c428e666abcaf4aa4f595168eaf256e4e755e 159359: a80d9acf0cb81654fb7a9c2544ef465fe9cea402 v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) 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)