From ddfd1b7b945d4f3f72f0edbcce43a65ac6a46639 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 17 Dec 2007 23:05:35 -0700
Subject: [PATCH] --- yaml --- r: 75821 b: refs/heads/master c:
 e43b9192c59402685bd1f809068dd13aa5931570 h: refs/heads/master i:   75819:
 ac0f72a8a88bb8fc7e7d6167ddb25aa97fdfd0f4 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/params.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index bbd9fb31fdc0..74b381c605a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5815ddf26aa8208d4ad79b4fba5e6bf7d5ba688
+refs/heads/master: e43b9192c59402685bd1f809068dd13aa5931570
diff --git a/trunk/kernel/params.c b/trunk/kernel/params.c
index 97e092312155..1078b148ca80 100644
--- a/trunk/kernel/params.c
+++ b/trunk/kernel/params.c
@@ -561,11 +561,9 @@ static void __init kernel_param_sysfs_setup(const char *name,
 
 	mk->mod = THIS_MODULE;
 	mk->kobj.kset = module_kset;
-	mk->kobj.ktype = &module_ktype;
-	kobject_set_name(&mk->kobj, name);
-	kobject_init(&mk->kobj);
-	ret = kobject_add(&mk->kobj);
+	ret = kobject_init_and_add(&mk->kobj, &module_ktype, NULL, "%s", name);
 	if (ret) {
+		kobject_put(&mk->kobj);
 		printk(KERN_ERR "Module '%s' failed to be added to sysfs, "
 		      "error number %d\n", name, ret);
 		printk(KERN_ERR	"The system will be unstable now.\n");