diff options
author | Eli Cohen <eli@dev.mellanox.co.il> | 2014-01-14 10:45:22 -0500 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2014-01-23 02:23:53 -0500 |
commit | 1bde6e301cf6217da9238086c958f532b16e504d (patch) | |
tree | 1057c4c99f52368b9225490c9eaf85d85eecf846 | |
parent | 9e9c47d07d447e09a66ee528c3ebad9ba359af6a (diff) |
IB/mlx5: Abort driver cleanup if teardown hca fails
Do not continue with cleanup flow. If this ever happens we can check which
resources remained open.
Signed-off-by: Eli Cohen <eli@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/main.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 40a9f5ed814d..a064f06e0cb8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c | |||
@@ -460,7 +460,10 @@ disable_msix: | |||
460 | 460 | ||
461 | err_stop_poll: | 461 | err_stop_poll: |
462 | mlx5_stop_health_poll(dev); | 462 | mlx5_stop_health_poll(dev); |
463 | mlx5_cmd_teardown_hca(dev); | 463 | if (mlx5_cmd_teardown_hca(dev)) { |
464 | dev_err(&dev->pdev->dev, "tear_down_hca failed, skip cleanup\n"); | ||
465 | return err; | ||
466 | } | ||
464 | 467 | ||
465 | err_pagealloc_stop: | 468 | err_pagealloc_stop: |
466 | mlx5_pagealloc_stop(dev); | 469 | mlx5_pagealloc_stop(dev); |
@@ -503,7 +506,10 @@ void mlx5_dev_cleanup(struct mlx5_core_dev *dev) | |||
503 | mlx5_eq_cleanup(dev); | 506 | mlx5_eq_cleanup(dev); |
504 | mlx5_disable_msix(dev); | 507 | mlx5_disable_msix(dev); |
505 | mlx5_stop_health_poll(dev); | 508 | mlx5_stop_health_poll(dev); |
506 | mlx5_cmd_teardown_hca(dev); | 509 | if (mlx5_cmd_teardown_hca(dev)) { |
510 | dev_err(&dev->pdev->dev, "tear_down_hca failed, skip cleanup\n"); | ||
511 | return; | ||
512 | } | ||
507 | mlx5_pagealloc_stop(dev); | 513 | mlx5_pagealloc_stop(dev); |
508 | mlx5_reclaim_startup_pages(dev); | 514 | mlx5_reclaim_startup_pages(dev); |
509 | mlx5_core_disable_hca(dev); | 515 | mlx5_core_disable_hca(dev); |