diff options
| author | Johannes Berg | 2012-12-06 15:57:14 +0100 |
|---|---|---|
| committer | Johannes Berg | 2013-01-03 13:01:31 +0100 |
| commit | 361c9c8b0eeeec7d881e018d5143bf883558c566 (patch) | |
| tree | 631cd436b7e80b8134084a935337c6ee3243bd7b /drivers/net/wireless/brcm80211 | |
| parent | regulatory: use RCU to protect last_request (diff) | |
| download | kernel-qcow2-linux-361c9c8b0eeeec7d881e018d5143bf883558c566.tar.gz kernel-qcow2-linux-361c9c8b0eeeec7d881e018d5143bf883558c566.tar.xz kernel-qcow2-linux-361c9c8b0eeeec7d881e018d5143bf883558c566.zip | |
regulatory: use IS_ERR macro family for freq_reg_info
Instead of returning an error and filling a pointer
return the pointer and an ERR_PTR value in error cases.
Acked-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/channel.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c index 30272519d795..4eb3f0d52105 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c @@ -670,7 +670,7 @@ brcms_reg_apply_beaconing_flags(struct wiphy *wiphy, struct ieee80211_supported_band *sband; struct ieee80211_channel *ch; const struct ieee80211_reg_rule *rule; - int band, i, ret; + int band, i; for (band = 0; band < IEEE80211_NUM_BANDS; band++) { sband = wiphy->bands[band]; @@ -685,9 +685,8 @@ brcms_reg_apply_beaconing_flags(struct wiphy *wiphy, continue; if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) { - ret = freq_reg_info(wiphy, ch->center_freq, - &rule); - if (ret) + rule = freq_reg_info(wiphy, ch->center_freq); + if (IS_ERR(rule)) continue; if (!(rule->flags & NL80211_RRF_NO_IBSS)) |