From bab4882468ebee8e17c9229c795753dddbf4a196 Mon Sep 17 00:00:00 2001
From: Roland Dreier <rdreier@cisco.com>
Date: Mon, 20 Apr 2009 18:32:08 +0000
Subject: [PATCH] --- yaml --- r: 143935 b: refs/heads/master c:
 1a44cc3778f63dca5795708da2a2a7696da7fd61 h: refs/heads/master i:   143933:
 3f1276a7af1327330ef1b522747dc82d9ad1fe9b   143931:
 037aa060130d9aa194c67bb5fdce14b6eb3aa3a2   143927:
 575c2525c9e1d1fa5bb34691ead25b4e5cfa345c   143919:
 1a3f7f72ad7ffedcfd41a7350577c6d0a520fac4   143903:
 0b18f4b7086d57bce84c738c369581893eb8a392   143871:
 f9d9a86c9306f488d8e3b3cac5fdb2c2af72a9e4 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/mlx4/en_main.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ec1c59989ad2..de3a9c705da8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1b243afac302d181d19c8024c355d9677beab49
+refs/heads/master: 1a44cc3778f63dca5795708da2a2a7696da7fd61
diff --git a/trunk/drivers/net/mlx4/en_main.c b/trunk/drivers/net/mlx4/en_main.c
index eda72dd2120f..510633fd57f6 100644
--- a/trunk/drivers/net/mlx4/en_main.c
+++ b/trunk/drivers/net/mlx4/en_main.c
@@ -181,7 +181,7 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
 	mdev->workqueue = create_singlethread_workqueue("mlx4_en");
 	if (!mdev->workqueue) {
 		err = -ENOMEM;
-		goto err_close_nic;
+		goto err_mr;
 	}
 
 	/* At this stage all non-port specific tasks are complete:
@@ -214,9 +214,8 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
 	flush_workqueue(mdev->workqueue);
 
 	/* Stop event queue before we drop down to release shared SW state */
-
-err_close_nic:
 	destroy_workqueue(mdev->workqueue);
+
 err_mr:
 	mlx4_mr_free(dev, &mdev->mr);
 err_uar: