From patchwork Thu Jul 22 11:26:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 113570 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6MBRnQ4014676 for ; Thu, 22 Jul 2010 11:27:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759220Ab0GVL1r (ORCPT ); Thu, 22 Jul 2010 07:27:47 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:63386 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755563Ab0GVL1p (ORCPT ); Thu, 22 Jul 2010 07:27:45 -0400 Received: by fxm14 with SMTP id 14so4193077fxm.19 for ; Thu, 22 Jul 2010 04:27:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=R2/vd9Fjtl3+4wGl3b+Jmuacz8Zh8reCEFox3rB/bB8=; b=jVlKxCcU0A+gcUNa8IVFh7ks/ULdn5TEULXkYxD0VtcORKi1HPPNKPHcgXv9LjPPg+ zcGmVK+hDHgPQuqC1Wz+mtwCarJXN7OgT5VN9+SggzJRolljoKv1cGNNdobCGkMkMgaq m0Unv6r0bnBiipT4rvs+GCRUcx5BTkOBgCbEc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=KwzfzQ32Qkk8zuqy7QPla9+du3YAWkE+jEjijtZwWE4QUo5RNJL469vmrrI2Z8hKD4 4knybZtC8bFZgrohIf4AvL+JeAmFtXfLO6mU8umE+Yi1lwZd5eDPjg0knhNaAhfSi5zU CE76bIiEvmqcOjUHIw1Vsm3qtlPsjqgOY5z08= Received: by 10.223.120.82 with SMTP id c18mr1660453far.69.1279798063988; Thu, 22 Jul 2010 04:27:43 -0700 (PDT) Received: from bicker ([205.177.176.130]) by mx.google.com with ESMTPS id h8sm3283501faj.38.2010.07.22.04.27.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 22 Jul 2010 04:27:43 -0700 (PDT) Date: Thu, 22 Jul 2010 13:26:50 +0200 From: Dan Carpenter To: Johannes Berg Cc: "John W. Linville" , "David S. Miller" , "Luis R. Rodriguez" , Benoit PAPILLAULT , linux-wireless@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch -next] wireless: remove unneeded variable from regulatory_hint_11d() Message-ID: <20100722112650.GE17585@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 22 Jul 2010 11:27:49 +0000 (UTC) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 48baf28..ec4e76f 100644 --- a/net/wireless/reg.c +++ b/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); }