summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl12xx/testmode.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-09-15 00:02:28 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-09-15 00:02:28 +0100
commit1db3706b05b11abcf2673ffbed5ad43b4c90ed11 (patch)
tree09fa867d9d9db6ed475eaa889da143603441e1a6 /drivers/net/wireless/wl12xx/testmode.c
parentad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (diff)
parent63d15148b6058ab0037343390e8918503ed81968 (diff)
Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'drivers/net/wireless/wl12xx/testmode.c')
-rw-r--r--drivers/net/wireless/wl12xx/testmode.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/testmode.c b/drivers/net/wireless/wl12xx/testmode.c
index 5d5e1ef87206..88add68bd9ac 100644
--- a/drivers/net/wireless/wl12xx/testmode.c
+++ b/drivers/net/wireless/wl12xx/testmode.c
@@ -139,12 +139,15 @@ static int wl1271_tm_cmd_interrogate(struct wl1271 *wl, struct nlattr *tb[])
if (ret < 0) {
wl1271_warning("testmode cmd interrogate failed: %d", ret);
+ kfree(cmd);
return ret;
}
skb = cfg80211_testmode_alloc_reply_skb(wl->hw->wiphy, sizeof(*cmd));
- if (!skb)
+ if (!skb) {
+ kfree(cmd);
return -ENOMEM;
+ }
NLA_PUT(skb, WL1271_TM_ATTR_DATA, sizeof(*cmd), cmd);