Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mlx4: Check correct variable for allocation failure
  RDMA/nes: Correct cap.max_inline_data assignment in nes_query_qp()
  RDMA/cm: Set num_paths when manually assigning path records
  IB/cm: Fix device_create() return value check

4 files changed, 7 insertions, 7 deletions

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index fc73d6ac11b6..ad63b79afac1 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -3694,7 +3694,7 @@ static void cm_add_one(struct ib_device *ib_device)
         cm_dev->device = device_create(&cm_class, &ib_device->dev,
                                        MKDEV(0, 0), NULL,
                                        "%s", ib_device->name);
-        if (!cm_dev->device) {
+        if (IS_ERR(cm_dev->device)) {
                 kfree(cm_dev);
                 return;
         }
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 7794249430ca..6d777069d86d 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1684,6 +1684,7 @@ int rdma_set_ib_paths(struct rdma_cm_id *id,
         }
 
         memcpy(id->route.path_rec, path_rec, sizeof *path_rec * num_paths);
+        id->route.num_paths = num_paths;
         return 0;
 err:
         cma_comp_exch(id_priv, CMA_ROUTE_RESOLVED, CMA_ADDR_RESOLVED);
diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c
index 56147b28a23a..1d27b9a8e2d6 100644
--- a/drivers/infiniband/hw/mlx4/mr.c
+++ b/drivers/infiniband/hw/mlx4/mr.c
@@ -240,7 +240,7 @@ struct ib_fast_reg_page_list *mlx4_ib_alloc_fast_reg_page_list(struct ib_device
         mfrpl->mapped_page_list = dma_alloc_coherent(&dev->dev->pdev->dev,
                                                      size, &mfrpl->map,
                                                      GFP_KERNEL);
-        if (!mfrpl->ibfrpl.page_list)
+        if (!mfrpl->mapped_page_list)
                 goto err_free;
 
         WARN_ON(mfrpl->map & 0x3f);
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 5a076e8f116a..e54f312e4bdc 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -2821,11 +2821,10 @@ static int nes_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         attr->cap.max_send_wr = nesqp->hwqp.sq_size;
         attr->cap.max_recv_wr = nesqp->hwqp.rq_size;
         attr->cap.max_recv_sge = 1;
-        if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
-                init_attr->cap.max_inline_data = 0;
-        } else {
-                init_attr->cap.max_inline_data = 64;
-        }
+        if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA)
+                attr->cap.max_inline_data = 0;
+        else
+                attr->cap.max_inline_data = 64;
 
         init_attr->event_handler = nesqp->ibqp.event_handler;
         init_attr->qp_context = nesqp->ibqp.qp_context;