From d938ca71a5ad146e5d0c5d3753ea8db897d7eae2 Mon Sep 17 00:00:00 2001
From: Niko Jokinen <ext-niko.k.jokinen@nokia.com>
Date: Wed, 15 Jul 2009 11:00:53 +0300
Subject: [PATCH] --- yaml --- r: 155864 b: refs/heads/master c:
 6c95e2a2f0f0bf4c8880d5b74b2f7f359d352d03 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/wireless/nl80211.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d421ff370d94..b737d3c84d80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3da7429ce92abd79b14e2275a28be144ce2c3013
+refs/heads/master: 6c95e2a2f0f0bf4c8880d5b74b2f7f359d352d03
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 43bdb1372cae..634496b3ed77 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -997,7 +997,7 @@ static int nl80211_get_key(struct sk_buff *skb, struct genl_info *info)
 
 	if (IS_ERR(hdr)) {
 		err = PTR_ERR(hdr);
-		goto out;
+		goto free_msg;
 	}
 
 	cookie.msg = msg;
@@ -1011,7 +1011,7 @@ static int nl80211_get_key(struct sk_buff *skb, struct genl_info *info)
 				&cookie, get_key_callback);
 
 	if (err)
-		goto out;
+		goto free_msg;
 
 	if (cookie.error)
 		goto nla_put_failure;
@@ -1022,6 +1022,7 @@ static int nl80211_get_key(struct sk_buff *skb, struct genl_info *info)
 
  nla_put_failure:
 	err = -ENOBUFS;
+ free_msg:
 	nlmsg_free(msg);
  out:
 	cfg80211_put_dev(drv);