From e494524a3d9bcea1bb258975171d6b1c644a2808 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Mon, 16 Mar 2009 21:47:33 +0200
Subject: [PATCH] --- yaml --- r: 132533 b: refs/heads/master c:
 640c65eae673d2caf6e7bf61c1eb4e9513b88fda h: refs/heads/master i:   132531:
 968a8985d39a8c25b45c84d4ec1db7066d5e70cc v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/zd1211rw/zd_mac.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3a11b4bd3571..e0258abfb031 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 055249d20de06c290fe7625be0a7164bef3958f5
+refs/heads/master: 640c65eae673d2caf6e7bf61c1eb4e9513b88fda
diff --git a/trunk/drivers/net/wireless/zd1211rw/zd_mac.c b/trunk/drivers/net/wireless/zd1211rw/zd_mac.c
index a611ad857983..847057d682b1 100644
--- a/trunk/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/trunk/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -575,13 +575,17 @@ static int zd_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 
 	r = fill_ctrlset(mac, skb);
 	if (r)
-		return r;
+		goto fail;
 
 	info->rate_driver_data[0] = hw;
 
 	r = zd_usb_tx(&mac->chip.usb, skb);
 	if (r)
-		return r;
+		goto fail;
+	return 0;
+
+fail:
+	dev_kfree_skb(skb);
 	return 0;
 }