diff options
| author |   Leon Romanovsky <leonro@mellanox.com> | 2018-04-23 17:01:56 +0300 |
|---|---|---|
| committer |   Doug Ledford <dledford@redhat.com> | 2018-04-27 11:03:15 -0400 |
| commit | 444261ca6ff201fa03de97a5041237e67a9d8d31 (patch) | |
| tree | 6effb16897e4d1e102111fcd0c730706f65ca060 | |
| parent | IB/mlx5: Fix represent correct netdevice in dual port RoCE (diff) | |
| download | linux-dev-444261ca6ff201fa03de97a5041237e67a9d8d31.tar.xz linux-dev-444261ca6ff201fa03de97a5041237e67a9d8d31.zip | |
RDMA/mlx5: Properly check return value of mlx5_get_uars_page
Starting from commit 72f36be06138 ("net/mlx5: Fix mlx5_get_uars_page to
return error code") the mlx5_get_uars_page() call returns error in case
of failure, but it was mistakenly overlooked in the merge commit.
Fixes: e7996a9a77fc ("Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git")
Reported-by: Alaa Hleihel <alaa@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
| -rw-r--r-- | drivers/infiniband/hw/mlx5/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index 78a4b2797057..a42c6b1cdb5a 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -5426,9 +5426,7 @@ static void mlx5_ib_stage_cong_debugfs_cleanup(struct mlx5_ib_dev *dev) static int mlx5_ib_stage_uar_init(struct mlx5_ib_dev *dev) { dev->mdev->priv.uar = mlx5_get_uars_page(dev->mdev); - if (!dev->mdev->priv.uar) - return -ENOMEM; - return 0; + return PTR_ERR_OR_ZERO(dev->mdev->priv.uar); } static void mlx5_ib_stage_uar_cleanup(struct mlx5_ib_dev *dev) |