diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-23 21:26:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-23 21:26:27 -0400 |
| commit | 8244132ea89cdd128003f5b9980fab50d8d36d72 (patch) | |
| tree | c6cf9327cf9b6bab5bb830bbf389a514f4d7bb95 /drivers/net/netxen/netxen_nic_ctx.c | |
| parent | 7b2ff18ee7b0ec4bc3162f821e221781aaca48bd (diff) | |
| parent | 38000a94a902e94ca8b5498f7871c6316de8957a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/ip_output.c
Diffstat (limited to 'drivers/net/netxen/netxen_nic_ctx.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_ctx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/netxen/netxen_nic_ctx.c index f26e54716c88..3a41b6a84a68 100644 --- a/drivers/net/netxen/netxen_nic_ctx.c +++ b/drivers/net/netxen/netxen_nic_ctx.c | |||
| @@ -629,7 +629,8 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter) | |||
| 629 | if (addr == NULL) { | 629 | if (addr == NULL) { |
| 630 | dev_err(&pdev->dev, "%s: failed to allocate tx desc ring\n", | 630 | dev_err(&pdev->dev, "%s: failed to allocate tx desc ring\n", |
| 631 | netdev->name); | 631 | netdev->name); |
| 632 | return -ENOMEM; | 632 | err = -ENOMEM; |
| 633 | goto err_out_free; | ||
| 633 | } | 634 | } |
| 634 | 635 | ||
| 635 | tx_ring->desc_head = (struct cmd_desc_type0 *)addr; | 636 | tx_ring->desc_head = (struct cmd_desc_type0 *)addr; |