From 58ad41b162d6b5195132b8afac607005aefb2926 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 22 Jul 2010 13:26:50 +0200 Subject: [PATCH] --- yaml --- r: 203810 b: refs/heads/master c: f9f9b6e3e3128e2b4d01a6e5ed0bb73cbb9a0a37 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 95afc2386aa4..b15894c94afe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e988014cd6dec991f095305256f57168b5610e8 +refs/heads/master: f9f9b6e3e3128e2b4d01a6e5ed0bb73cbb9a0a37 diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index 48baf28cc4b6..ec4e76f95044 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -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; @@ -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]; @@ -1543,8 +1542,6 @@ void regulatory_hint_11d(struct wiphy *wiphy, return; -free_rd_out: - kfree(rd); out: mutex_unlock(®_mutex); }