Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 203810
b: refs/heads/master
c: f9f9b6e
h: refs/heads/master
v: v3
  • Loading branch information
Dan Carpenter authored and John W. Linville committed Jul 26, 2010
1 parent 9a6dab5 commit 58ad41b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7e988014cd6dec991f095305256f57168b5610e8
refs/heads/master: f9f9b6e3e3128e2b4d01a6e5ed0bb73cbb9a0a37
5 changes: 1 addition & 4 deletions trunk/net/wireless/reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -1492,7 +1492,6 @@ void regulatory_hint_11d(struct wiphy *wiphy,
u8 *country_ie,
u8 country_ie_len)
{
struct ieee80211_regdomain *rd = NULL;
char alpha2[2];
enum environment_cap env = ENVIRON_ANY;
struct regulatory_request *request;
Expand Down Expand Up @@ -1529,7 +1528,7 @@ void regulatory_hint_11d(struct wiphy *wiphy,

request = kzalloc(sizeof(struct regulatory_request), GFP_KERNEL);
if (!request)
goto free_rd_out;
goto out;

request->wiphy_idx = get_wiphy_idx(wiphy);
request->alpha2[0] = alpha2[0];
Expand All @@ -1543,8 +1542,6 @@ void regulatory_hint_11d(struct wiphy *wiphy,

return;

free_rd_out:
kfree(rd);
out:
mutex_unlock(&reg_mutex);
}
Expand Down

0 comments on commit 58ad41b

Please sign in to comment.