diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-31 13:37:12 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-31 13:37:12 +1100 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/net/acenic.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/net/acenic.c')
| -rw-r--r-- | drivers/net/acenic.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index dbecc6bf785..b8953de5664 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c @@ -871,10 +871,8 @@ static void ace_init_cleanup(struct net_device *dev) if (ap->info) pci_free_consistent(ap->pdev, sizeof(struct ace_info), ap->info, ap->info_dma); - if (ap->skb) - kfree(ap->skb); - if (ap->trace_buf) - kfree(ap->trace_buf); + kfree(ap->skb); + kfree(ap->trace_buf); if (dev->irq) free_irq(dev->irq, dev); |