| From: Tarick Bedeir <tarick@google.com> |
| Date: Sun, 13 May 2018 16:38:45 -0700 |
| Subject: net/mlx4_core: Fix error handling in mlx4_init_port_info. |
| |
| commit 57f6f99fdad9984801cde05c1db68fe39b474a10 upstream. |
| |
| Avoid exiting the function with a lingering sysfs file (if the first |
| call to device_create_file() fails while the second succeeds), and avoid |
| calling devlink_port_unregister() twice. |
| |
| In other words, either mlx4_init_port_info() succeeds and returns zero, or |
| it fails, returns non-zero, and requires no cleanup. |
| |
| Fixes: 096335b3f983 ("mlx4_core: Allow dynamic MTU configuration for IB ports") |
| Signed-off-by: Tarick Bedeir <tarick@google.com> |
| Reviewed-by: Leon Romanovsky <leonro@mellanox.com> |
| Reviewed-by: Tariq Toukan <tariqt@mellanox.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/net/ethernet/mellanox/mlx4/main.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/ethernet/mellanox/mlx4/main.c |
| +++ b/drivers/net/ethernet/mellanox/mlx4/main.c |
| @@ -2048,6 +2048,7 @@ static int mlx4_init_port_info(struct ml |
| if (err) { |
| mlx4_err(dev, "Failed to create file for port %d\n", port); |
| info->port = -1; |
| + return err; |
| } |
| |
| sprintf(info->dev_mtu_name, "mlx4_port%d_mtu", port); |
| @@ -2066,9 +2067,10 @@ static int mlx4_init_port_info(struct ml |
| mlx4_err(dev, "Failed to create mtu file for port %d\n", port); |
| device_remove_file(&info->dev->pdev->dev, &info->port_attr); |
| info->port = -1; |
| + return err; |
| } |
| |
| - return err; |
| + return 0; |
| } |
| |
| static void mlx4_cleanup_port_info(struct mlx4_port_info *info) |
