Skip to content

Commit

Permalink
mlx4_en: Fix cleanup if workqueue create in mlx4_en_add() fails
Browse files Browse the repository at this point in the history
If creating a workqueue fails, don't jump to the error path where that
same workqueue is destroyed, since destroy_workqueue() can't handle a
NULL pointer.

This was spotted by the Coverity checker (CID 2617).

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Roland Dreier authored and David S. Miller committed Apr 21, 2009
1 parent b1b243a commit 1a44cc3
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions 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 1a44cc3

Please sign in to comment.