git: d8cbfa101cbe - main - mlx5core: Make sure error code is propagated on error.
Hans Petter Selasky
hselasky at FreeBSD.org
Mon Jul 12 13:09:35 UTC 2021
The branch main has been updated by hselasky:
URL: https://cgit.FreeBSD.org/src/commit/?id=d8cbfa101cbe3a9ece41120af93884177aff728a
commit d8cbfa101cbe3a9ece41120af93884177aff728a
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-12 12:22:31 +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.
MFC after: 1 week
Reviewed by: kib
Sponsored by: Mellanox Technologies // NVIDIA Networking
---
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;
}
More information about the dev-commits-src-all
mailing list