diff options
| author | Roland Dreier <rdreier@cisco.com> | 2009-04-20 18:32:08 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-21 01:47:08 -0700 |
| commit | 1a44cc3778f63dca5795708da2a2a7696da7fd61 (patch) | |
| tree | 44a95e152ab8d540a54012a9484ebd02945d937a /drivers/net | |
| parent | b1b243afac302d181d19c8024c355d9677beab49 (diff) | |
| download | op-kernel-dev-1a44cc3778f63dca5795708da2a2a7696da7fd61.zip op-kernel-dev-1a44cc3778f63dca5795708da2a2a7696da7fd61.tar.gz | |
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: Roland Dreier <rolandd@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/mlx4/en_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c index eda72dd..510633f 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: |
