RDMA/mlx5: Properly check return value of mlx5_get_uars_page

Leon Romanovsky · dledford · commit 444261ca6ff2 · 2018-04-27T11:03:15.000-04:00
Starting from commit 72f36be ("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: e7996a9 ("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>
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -5426,9 +5426,7 @@ static void mlx5_ib_stage_cong_debugfs_cleanup(struct mlx5_ib_dev *dev)`
`5426`	`5426`	`static int mlx5_ib_stage_uar_init(struct mlx5_ib_dev *dev)`
`5427`	`5427`	`{`
`5428`	`5428`	`dev->mdev->priv.uar = mlx5_get_uars_page(dev->mdev);`
`5429`		`- if (!dev->mdev->priv.uar)`
`5430`		`- return -ENOMEM;`
`5431`		`- return 0;`
	`5429`	`+ return PTR_ERR_OR_ZERO(dev->mdev->priv.uar);`
`5432`	`5430`	`}`
`5433`	`5431`
`5434`	`5432`	`static void mlx5_ib_stage_uar_cleanup(struct mlx5_ib_dev *dev)`