From 6e449052634b9b3bda8371a4db25bd8e763b04ac Mon Sep 17 00:00:00 2001
From: Jani Nikula <ext-jani.1.nikula@nokia.com>
Date: Thu, 11 Mar 2010 16:17:28 +0000
Subject: [PATCH] --- yaml --- r: 189749 b: refs/heads/master c:
 3e340c05c0def3bb68db6751299b7821c2ba0621 h: refs/heads/master i:   189747:
 fb828ad40e6cb532bc25d67b8cee8924f23ed816 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/infiniband/core/cm.c  | 2 +-
 trunk/drivers/infiniband/core/cma.c | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cdcdfc5dbce0..e9e63548a670 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae2d9293d7cfba70f44f59cfedb44122828c73b8
+refs/heads/master: 3e340c05c0def3bb68db6751299b7821c2ba0621
diff --git a/trunk/drivers/infiniband/core/cm.c b/trunk/drivers/infiniband/core/cm.c
index 764787ebe8d8..c9730cb3f695 100644
--- a/trunk/drivers/infiniband/core/cm.c
+++ b/trunk/drivers/infiniband/core/cm.c
@@ -3693,7 +3693,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/trunk/drivers/infiniband/core/cma.c b/trunk/drivers/infiniband/core/cma.c
index 09b4b13fdbee..875e34e0b235 100644
--- a/trunk/drivers/infiniband/core/cma.c
+++ b/trunk/drivers/infiniband/core/cma.c
@@ -1683,7 +1683,6 @@ 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);