diff options
| author |   Brice Goglin <brice@myri.com> | 2007-03-07 19:59:52 +0100 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-03-09 11:51:31 -0500 |
| commit | 355c7265f4745a2aa6f0482d466e2271e6b3c61a (patch) | |
| tree | ae8ac39636bb84d9a051b08ee5fd61697e625fe7 /drivers/net/myri10ge/myri10ge.c | |
| parent | netxen: fix warnings (diff) | |
| download | linux-dev-355c7265f4745a2aa6f0482d466e2271e6b3c61a.tar.xz linux-dev-355c7265f4745a2aa6f0482d466e2271e6b3c61a.zip | |
myri10ge: fix error checking and return value in myri10ge_allocate_rings
Fix a missing error check in myri10ge_allocate_rings() and set status
to -ENOMEM before all actual allocations so that the error path returns
what it should.
Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/myri10ge/myri10ge.c')
| -rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index b05dc6ed7fb7..db282ed9ab7d 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c @@ -1456,6 +1456,8 @@ static int myri10ge_allocate_rings(struct net_device *dev) status = myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_SEND_RING_SIZE, &cmd, 0); tx_ring_size = cmd.data0; status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_RX_RING_SIZE, &cmd, 0); + if (status != 0) + return status; rx_ring_size = cmd.data0; tx_ring_entries = tx_ring_size / sizeof(struct mcp_kreq_ether_send); @@ -1463,6 +1465,8 @@ static int myri10ge_allocate_rings(struct net_device *dev) mgp->tx.mask = tx_ring_entries - 1; mgp->rx_small.mask = mgp->rx_big.mask = rx_ring_entries - 1; + status = -ENOMEM; + /* allocate the host shadow rings */ bytes = 8 + (MYRI10GE_MAX_SEND_DESC_TSO + 4) |