svn commit: r353192 - stable/12/sys/dev/mlx5/mlx5_core

[Hans Petter Selasky]

Author: hselasky
Date: Mon Oct  7 08:43:03 2019
New Revision: 353192
URL: https://svnweb.freebsd.org/changeset/base/353192

Log:
  MFC r352960:
  Fix for missing cleanup code in error case in mlx5en.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c	Mon Oct  7 08:41:53 2019	(r353191)
+++ stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c	Mon Oct  7 08:43:03 2019	(r353192)
@@ -1133,13 +1133,13 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, st
 	err = mlx5_fpga_device_start(dev);
 	if (err) {
 		dev_err(&pdev->dev, "fpga device start failed %d\n", err);
-		goto err_fpga_start;
+		goto err_fs;
 	}
 
 	err = mlx5_register_device(dev);
 	if (err) {
 		dev_err(&pdev->dev, "mlx5_register_device failed %d\n", err);
-		goto err_fs;
+		goto err_fpga;
 	}
 
 	set_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state);
@@ -1148,7 +1148,9 @@ out:
 	mutex_unlock(&dev->intf_state_mutex);
 	return 0;
 
-err_fpga_start:
+err_fpga:
+	mlx5_fpga_device_stop(dev);
+
 err_fs:
 	mlx5_cleanup_fs(dev);