Commit 06627990 authored by Johannes Berg's avatar Johannes Berg

nl80211: clarify nl80211_set_reg() success path

Setting rd to NULL to avoid freeing it, just to be able to return
from the function in a single place, doesn't make much sense.

Return the set_regdom() return value directly.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1dad640b
...@@ -5836,10 +5836,8 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info) ...@@ -5836,10 +5836,8 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
} }
} }
r = set_regdom(rd, REGD_SOURCE_CRDA); /* set_regdom takes ownership of rd */
/* set_regdom took ownership */ return set_regdom(rd, REGD_SOURCE_CRDA);
rd = NULL;
bad_reg: bad_reg:
kfree(rd); kfree(rd);
return r; return r;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment