From 9c5fa67e9148b6252d65a71f5d8289f3fdd530e9 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: 75850 b: refs/heads/master c:
 ac3c8141f62f357169980ec21b7be6d29964a394 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/kernel/module.c | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index f6f72694a8d6..9bfa809c8f29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 649316b25b148e57c8ef71748fc69fa6db276ad1
+refs/heads/master: ac3c8141f62f357169980ec21b7be6d29964a394
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
index 0ae811785c59..89cd4c7361d8 100644
--- a/trunk/kernel/module.c
+++ b/trunk/kernel/module.c
@@ -1217,18 +1217,16 @@ int mod_sysfs_init(struct module *mod)
 		err = -EINVAL;
 		goto out;
 	}
-	memset(&mod->mkobj.kobj, 0, sizeof(mod->mkobj.kobj));
-	err = kobject_set_name(&mod->mkobj.kobj, "%s", mod->name);
-	if (err)
-		goto out;
-	mod->mkobj.kobj.kset = module_kset;
-	mod->mkobj.kobj.ktype = &module_ktype;
 	mod->mkobj.mod = mod;
 
-	kobject_init(&mod->mkobj.kobj);
+	memset(&mod->mkobj.kobj, 0, sizeof(mod->mkobj.kobj));
+	mod->mkobj.kobj.kset = module_kset;
+	err = kobject_init_and_add(&mod->mkobj.kobj, &module_ktype, NULL,
+				   "%s", mod->name);
+	if (err)
+		kobject_put(&mod->mkobj.kobj);
 
 	/* delay uevent until full sysfs population */
-	err = kobject_add(&mod->mkobj.kobj);
 out:
 	return err;
 }