Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/iucv/af_iucv.c

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c
index eda72dd2120f..510633fd57f6 100644
--- a/drivers/net/mlx4/en_main.c
+++ b/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 @@ err_free_netdev:
         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: