---

yaml --- r: 132533 b: refs/heads/master c: 640c65e h: refs/heads/master i: 132531: 968a898 v: v3
git-mirror · Mar 16, 2009 · e494524 · e494524
1 parent 6ee8901
commit e494524
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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;
 }