git: f919e2521470 - stable/13 - mlx5core: Make sure error code is propagated on error.

[Hans Petter Selasky]

The branch stable/13 has been updated by hselasky:

URL: https://cgit.FreeBSD.org/src/commit/?id=f919e2521470144bbe99602b516f9834ee00f636

commit f919e2521470144bbe99602b516f9834ee00f636
Author:     Hans Petter Selasky <hselasky at FreeBSD.org>
AuthorDate: 2021-06-16 13:01:41 +0000
Commit:     Hans Petter Selasky <hselasky at FreeBSD.org>
CommitDate: 2021-07-26 16:04:30 +0000

    mlx5core: Make sure error code is propagated on error.
    
    If mlx5_init_once() fails, mlx5_load_one() should fail too, else the
    device instance remains attached causing problems at reboot.
    
    Reviewed by:    kib
    Sponsored by:   Mellanox Technologies // NVIDIA Networking
    
    (cherry picked from commit d8cbfa101cbe3a9ece41120af93884177aff728a)
---
 sys/dev/mlx5/mlx5_core/mlx5_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/mlx5/mlx5_core/mlx5_main.c b/sys/dev/mlx5/mlx5_core/mlx5_main.c
index 37a55f65683c..755e8844a892 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_main.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c
@@ -1101,7 +1101,7 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv,
 
 	mlx5_start_health_poll(dev);
 
-	if (boot && mlx5_init_once(dev, priv)) {
+	if (boot && (err = mlx5_init_once(dev, priv))) {
 		mlx5_core_err(dev, "sw objs init failed\n");
 		goto err_stop_poll;
 	}