From b9df6f953a23a1871afdce0bf21e2ed5faed0e90 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sun, 14 Mar 2010 22:24:08 +0000
Subject: [PATCH] --- yaml --- r: 188141 b: refs/heads/master c:
 b8d689743106bab5c49dda87080e76aa78db8a56 h: refs/heads/master i:   188139:
 9f973a1fb6913d6e812498479d6dada6dc7217b4 v: v3

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

diff --git a/[refs] b/[refs]
index 22c773f3af8e..3bc4d524e673 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 873a69a358a6b393fd8d9d92e193ec8895cac4d7
+refs/heads/master: b8d689743106bab5c49dda87080e76aa78db8a56
diff --git a/trunk/drivers/net/myri10ge/myri10ge.c b/trunk/drivers/net/myri10ge/myri10ge.c
index 676c513e12fc..e84dd3ee9c5a 100644
--- a/trunk/drivers/net/myri10ge/myri10ge.c
+++ b/trunk/drivers/net/myri10ge/myri10ge.c
@@ -3687,7 +3687,6 @@ static void myri10ge_probe_slices(struct myri10ge_priv *mgp)
 	if (status != 0) {
 		dev_err(&mgp->pdev->dev, "failed reset\n");
 		goto abort_with_fw;
-		return;
 	}
 
 	mgp->max_intr_slots = cmd.data0 / sizeof(struct mcp_slot);