| From foo@baz Sun Jun 17 12:07:33 CEST 2018 |
| From: Leon Romanovsky <leonro@mellanox.com> |
| Date: Mon, 23 Apr 2018 17:01:56 +0300 |
| Subject: RDMA/mlx5: Properly check return value of mlx5_get_uars_page |
| |
| From: Leon Romanovsky <leonro@mellanox.com> |
| |
| [ Upstream commit 444261ca6ff201fa03de97a5041237e67a9d8d31 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/infiniband/hw/mlx5/main.c | 4 +--- |
| 1 file changed, 1 insertion(+), 3 deletions(-) |
| |
| --- a/drivers/infiniband/hw/mlx5/main.c |
| +++ b/drivers/infiniband/hw/mlx5/main.c |
| @@ -4833,9 +4833,7 @@ static void mlx5_ib_stage_cong_debugfs_c |
| 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) |
