diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-09 17:34:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-09 17:34:20 -0500 |
| commit | b2d3298e0916fa059712691c85a0e97becc4ab9f (patch) | |
| tree | c7d5ea46a9dbf9cebdb122df4aaf0beda6e7621e /drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | |
| parent | 1a0bdadb4e36abac63b0a9787f372aac30c11a9e (diff) | |
| parent | a7f4255f906f60f72e00aad2fb000939449ff32e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/resource_tracker.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index bfdb7af19e49..8752e6e08169 100644 --- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | |||
| @@ -2255,8 +2255,7 @@ int mlx4_MODIFY_CQ_wrapper(struct mlx4_dev *dev, int slave, | |||
| 2255 | 2255 | ||
| 2256 | if (vhcr->op_modifier == 0) { | 2256 | if (vhcr->op_modifier == 0) { |
| 2257 | err = handle_resize(dev, slave, vhcr, inbox, outbox, cmd, cq); | 2257 | err = handle_resize(dev, slave, vhcr, inbox, outbox, cmd, cq); |
| 2258 | if (err) | 2258 | goto ex_put; |
| 2259 | goto ex_put; | ||
| 2260 | } | 2259 | } |
| 2261 | 2260 | ||
| 2262 | err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd); | 2261 | err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd); |