aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-12-01 06:07:56 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-12-05 09:35:45 -0500
commit4a4f4d805db5c930ee4185162dcdc8db9a0379d5 (patch)
treeecda44146ae7936ada0e83b00245aeb63e1088bf /net/wireless
parent8bef7a10014c4579c66579ab47fc1bb9563ac42a (diff)
cfg80211: fix wiphy remove if no regulatory request
Fixes the segfault I just pointed out. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/reg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 0990059f7e48..9e5a9f975478 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1330,7 +1330,7 @@ int set_regdom(const struct ieee80211_regdomain *rd)
1330/* Caller must hold cfg80211_drv_mutex */ 1330/* Caller must hold cfg80211_drv_mutex */
1331void reg_device_remove(struct wiphy *wiphy) 1331void reg_device_remove(struct wiphy *wiphy)
1332{ 1332{
1333 if (!last_request->wiphy) 1333 if (!last_request || !last_request->wiphy)
1334 return; 1334 return;
1335 if (last_request->wiphy != wiphy) 1335 if (last_request->wiphy != wiphy)
1336 return; 1336 return;