diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-13 10:19:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-13 10:19:43 +0200 |
| commit | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (patch) | |
| tree | 4f583715a29ac95723b85532f47c3c568a544f1d /drivers/net/gianfar.c | |
| parent | tipc: Fix race condition when creating socket or native port (diff) | |
| parent | [netdrvr] Trim trailing whitespace for several drivers (diff) | |
| download | linux-99dd1a2b8347ac2ae802300b7862f6f7bcf17139.tar.xz linux-99dd1a2b8347ac2ae802300b7862f6f7bcf17139.zip | |
Merge branch 'upstream-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 587afe7be689..642dc633b444 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -925,7 +925,7 @@ rx_irq_fail: tx_irq_fail: free_irq(priv->interruptError, dev); err_irq_fail: -err_rxalloc_fail: +err_rxalloc_fail: rx_skb_fail: free_skb_resources(priv); tx_skb_fail: |