Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150139
b: refs/heads/master
c: 0ef9ccd
h: refs/heads/master
i:
  150137: 786d0ff
  150135: 20538a7
v: v3
  • Loading branch information
Chris Wright authored and John W. Linville committed May 6, 2009
1 parent dc65781 commit 1c419f7
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 2cfb1f5e20f260e6ff306ba181efee956ba48f54
refs/heads/master: 0ef9ccdd9ec7f2cf28d0605c216d853687f5291d
8 changes: 4 additions & 4 deletions trunk/net/wireless/reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -2100,14 +2100,14 @@ void reg_device_remove(struct wiphy *wiphy)

assert_cfg80211_lock();

kfree(wiphy->regd);

if (last_request)
request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);

kfree(wiphy->regd);
if (!last_request || !request_wiphy)
return;
if (request_wiphy != wiphy)
if (!request_wiphy || request_wiphy != wiphy)
return;

last_request->wiphy_idx = WIPHY_IDX_STALE;
last_request->country_ie_env = ENVIRON_ANY;
}
Expand Down

0 comments on commit 1c419f7

Please sign in to comment.