From c8980886e621aad1d525059156fb9931ec020ec4 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Tue, 12 May 2009 11:33:39 +0100
Subject: [PATCH] --- yaml --- r: 144858 b: refs/heads/master c:
 34fd5dad46fc494c6ed3b174b2c991ea9961ebe9 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/mlx4/en_rx.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8538fd0a2bec..bbf31146d712 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d80cac0fe44fb87b2a3d35fddd7f534ea81cd90
+refs/heads/master: 34fd5dad46fc494c6ed3b174b2c991ea9961ebe9
diff --git a/trunk/drivers/net/mlx4/en_rx.c b/trunk/drivers/net/mlx4/en_rx.c
index 7942c4d3cd88..9ee873e872b3 100644
--- a/trunk/drivers/net/mlx4/en_rx.c
+++ b/trunk/drivers/net/mlx4/en_rx.c
@@ -951,7 +951,6 @@ static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv,
 	if (err) {
 		mlx4_err(mdev, "Failed to allocate qp #%d\n", qpn);
 		goto out;
-		return err;
 	}
 	qp->event = mlx4_en_sqp_event;