From b4a4cf0c9aab08ee883eaca78ff05d1c93e2719e Mon Sep 17 00:00:00 2001 From: Jack Morgenstein Date: Wed, 7 Mar 2012 05:56:35 +0000 Subject: [PATCH] --- yaml --- r: 288371 b: refs/heads/master c: dcf353b17007841f91e1735e33790508c84c9ad0 h: refs/heads/master i: 288369: 8ea2b419b1a0f22e69d9bc07b687a1dd7adbe609 288367: a01c7e87555e96db46a9d6c75592512c41f413e5 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 286999b5fc07..beceeb730160 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 783154573236f46b730b2eea17d2e6e04bdb3251 +refs/heads/master: dcf353b17007841f91e1735e33790508c84c9ad0 diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index bfdb7af19e49..8752e6e08169 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c @@ -2255,8 +2255,7 @@ int mlx4_MODIFY_CQ_wrapper(struct mlx4_dev *dev, int slave, if (vhcr->op_modifier == 0) { err = handle_resize(dev, slave, vhcr, inbox, outbox, cmd, cq); - if (err) - goto ex_put; + goto ex_put; } err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);