| From b1074614abc19c6aa5aff1dbc006bd2ce53b6205 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 13 Dec 2018 13:15:11 +0200 |
| Subject: net/mlx5: Continue driver initialization despite debugfs failure |
| |
| From: Leon Romanovsky <leonro@mellanox.com> |
| |
| [ Upstream commit 199fa087dc6b503baad06712716fac645a983e8a ] |
| |
| The failure to create debugfs entry is unpleasant event, but not enough |
| to abort drier initialization. Align the mlx5_core code to debugfs design |
| and continue execution whenever debugfs_create_dir() successes or not. |
| |
| Fixes: e126ba97dba9 ("mlx5: Add driver for Mellanox Connect-IB adapters") |
| Reviewed-by: Saeed Mahameed <saeedm@mellanox.com> |
| Signed-off-by: Leon Romanovsky <leonro@mellanox.com> |
| Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 +++----- |
| 1 file changed, 3 insertions(+), 5 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c |
| index d676088512cf8..c9fb589690ee9 100644 |
| --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c |
| +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c |
| @@ -786,11 +786,9 @@ static int mlx5_pci_init(struct mlx5_core_dev *dev, struct mlx5_priv *priv) |
| |
| priv->numa_node = dev_to_node(&dev->pdev->dev); |
| |
| - priv->dbg_root = debugfs_create_dir(dev_name(&pdev->dev), mlx5_debugfs_root); |
| - if (!priv->dbg_root) { |
| - dev_err(&pdev->dev, "Cannot create debugfs dir, aborting\n"); |
| - return -ENOMEM; |
| - } |
| + if (mlx5_debugfs_root) |
| + priv->dbg_root = |
| + debugfs_create_dir(pci_name(pdev), mlx5_debugfs_root); |
| |
| err = mlx5_pci_enable_device(dev); |
| if (err) { |
| -- |
| 2.20.1 |
| |
