diff options
author | Parav Pandit <parav@mellanox.com> | 2020-05-01 10:20:01 -0500 |
---|---|---|
committer | Saeed Mahameed <saeedm@mellanox.com> | 2020-05-15 15:44:17 -0700 |
commit | 4162f58b476b248d0718f3d6aad2e57da2b08a63 (patch) | |
tree | 9156f055da7fd1c2b362de2cf641e1958dea90bf | |
parent | e7f860e2106a4c288d98308c59545ddd350e4739 (diff) | |
download | linux-4162f58b476b248d0718f3d6aad2e57da2b08a63.tar.bz2 |
net/mlx5: Have single error unwinding path
Having multiple error unwinding path are error prone.
Lets have just one error unwinding path.
Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 742ba012c234..2e128068a48c 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -1217,10 +1217,9 @@ int mlx5_load_one(struct mlx5_core_dev *dev, bool boot) mlx5_register_device(dev); set_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state); -out: - mutex_unlock(&dev->intf_state_mutex); - return err; + mutex_unlock(&dev->intf_state_mutex); + return 0; err_devlink_reg: mlx5_unload(dev); @@ -1230,8 +1229,8 @@ err_load: function_teardown: mlx5_function_teardown(dev, boot); dev->state = MLX5_DEVICE_STATE_INTERNAL_ERROR; +out: mutex_unlock(&dev->intf_state_mutex); - return err; } |