From: Andrew Morton <akpm@linux-foundation.org>

Cc: Greg KH <greg@kroah.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/infiniband/core/cm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/infiniband/core/cm.c~git-infiniband-versus-driver-tree drivers/infiniband/core/cm.c
--- a/drivers/infiniband/core/cm.c~git-infiniband-versus-driver-tree
+++ a/drivers/infiniband/core/cm.c
@@ -3571,7 +3571,7 @@ static int cm_add_fs_obj(struct kobject 
 	if (!obj->parent)
 		return -EBUSY;
 
-	ret = kobject_register(obj);
+	ret = kobject_init_and_add(obj, type, parent, "%s", name);
 	if (ret)
 		kobject_put(parent);
 
@@ -3581,7 +3581,7 @@ static int cm_add_fs_obj(struct kobject 
 static void cm_remove_fs_obj(struct kobject *obj)
 {
 	kobject_put(obj->parent);
-	kobject_unregister(obj);
+	kobject_put(obj);
 }
 
 static int cm_create_port_fs(struct cm_port *port)
_