Commit 1a44cc37 authored by Roland Dreier's avatar Roland Dreier Committed by David S. Miller

mlx4_en: Fix cleanup if workqueue create in mlx4_en_add() fails

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: default avatarRoland Dreier <rolandd@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b1b243af
...@@ -181,7 +181,7 @@ static void *mlx4_en_add(struct mlx4_dev *dev) ...@@ -181,7 +181,7 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
mdev->workqueue = create_singlethread_workqueue("mlx4_en"); mdev->workqueue = create_singlethread_workqueue("mlx4_en");
if (!mdev->workqueue) { if (!mdev->workqueue) {
err = -ENOMEM; err = -ENOMEM;
goto err_close_nic; goto err_mr;
} }
/* At this stage all non-port specific tasks are complete: /* At this stage all non-port specific tasks are complete:
...@@ -214,9 +214,8 @@ err_free_netdev: ...@@ -214,9 +214,8 @@ err_free_netdev:
flush_workqueue(mdev->workqueue); flush_workqueue(mdev->workqueue);
/* Stop event queue before we drop down to release shared SW state */ /* Stop event queue before we drop down to release shared SW state */
err_close_nic:
destroy_workqueue(mdev->workqueue); destroy_workqueue(mdev->workqueue);
err_mr: err_mr:
mlx4_mr_free(dev, &mdev->mr); mlx4_mr_free(dev, &mdev->mr);
err_uar: err_uar:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment