diff --git a/[refs] b/[refs] index 861eb8dc8abb..be9b382bb793 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a01ddafd43f7d53a65ef053eb80a4dee58839c1f +refs/heads/master: 02ba0b3263f4eb41d2a5714cbe99207ae491a964 diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index f062b8b7000a..f8e7beb23add 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -711,14 +711,7 @@ int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by, kfree(last_request); last_request = request; - r = call_crda(alpha2); - -#ifndef CONFIG_WIRELESS_OLD_REGULATORY - if (r) - printk(KERN_ERR "cfg80211: Failed calling CRDA\n"); -#endif - - return r; + return call_crda(alpha2); } void regulatory_hint(struct wiphy *wiphy, const char *alpha2)