Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 143935
b: refs/heads/master
c: 1a44cc3
h: refs/heads/master
i:
  143933: 3f1276a
  143931: 037aa06
  143927: 575c252
  143919: 1a3f7f7
  143903: 0b18f4b
  143871: f9d9a86
v: v3
  • Loading branch information
Roland Dreier authored and David S. Miller committed Apr 21, 2009
1 parent 115dc7b commit bab4882
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b1b243afac302d181d19c8024c355d9677beab49
refs/heads/master: 1a44cc3778f63dca5795708da2a2a7696da7fd61
5 changes: 2 additions & 3 deletions trunk/drivers/net/mlx4/en_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit bab4882

Please sign in to comment.