| From: Leon Romanovsky <leonro@mellanox.com> |
| Date: Thu, 13 Dec 2018 13:15:11 +0200 |
| Subject: net/mlx5: Continue driver initialization despite debugfs failure |
| |
| commit 199fa087dc6b503baad06712716fac645a983e8a upstream. |
| |
| 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> |
| [bwh: Backported to 3.16: adjust context] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c |
| +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c |
| @@ -313,9 +313,9 @@ int mlx5_dev_init(struct mlx5_core_dev * |
| INIT_LIST_HEAD(&priv->pgdir_list); |
| spin_lock_init(&priv->mkey_lock); |
| |
| - priv->dbg_root = debugfs_create_dir(dev_name(&pdev->dev), mlx5_debugfs_root); |
| - if (!priv->dbg_root) |
| - return -ENOMEM; |
| + if (mlx5_debugfs_root) |
| + priv->dbg_root = |
| + debugfs_create_dir(pci_name(pdev), mlx5_debugfs_root); |
| |
| err = pci_enable_device(pdev); |
| if (err) { |