diff --git a/[refs] b/[refs]
index 74b381c605a5..8291b4acda87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e43b9192c59402685bd1f809068dd13aa5931570
+refs/heads/master: cf15126b3d4511e06e5299781ab74922590900be
diff --git a/trunk/kernel/user.c b/trunk/kernel/user.c
index 7f17e6e8fd65..ab4fd706993b 100644
--- a/trunk/kernel/user.c
+++ b/trunk/kernel/user.c
@@ -181,13 +181,12 @@ static int uids_user_create(struct user_struct *up)
 	int error;
 
 	memset(kobj, 0, sizeof(struct kobject));
-	kobj->ktype = &uids_ktype;
 	kobj->kset = uids_kset;
-	kobject_init(kobj);
-	kobject_set_name(&up->kobj, "%d", up->uid);
-	error = kobject_add(kobj);
-	if (error)
+	error = kobject_init_and_add(kobj, &uids_ktype, NULL, "%d", up->uid);
+	if (error) {
+		kobject_put(kobj);
 		goto done;
+	}
 
 	kobject_uevent(kobj, KOBJ_ADD);
 done: