diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-17 22:29:22 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-17 22:29:22 +0100 |
| commit | f10023a4ef3f5cc05457b059c6880bc447adfa1f (patch) | |
| tree | e5d229bb9719b0be27289a6736d2e22254da06f0 /drivers/net/wireless/zd1211rw | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/... (diff) | |
| parent | zd1211rw: Do not panic on device eject when associated (diff) | |
| download | linux-f10023a4ef3f5cc05457b059c6880bc447adfa1f.tar.xz linux-f10023a4ef3f5cc05457b059c6880bc447adfa1f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/zd1211rw')
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index a611ad857983..847057d682b1 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/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; } |