---

yaml --- r: 97201 b: refs/heads/master c: 34e4e2f h: refs/heads/master i: 97199: 56fcd68 v: v3
git-mirror · May 23, 2008 · c1a1105 · c1a1105
1 parent 792b973
commit c1a1105
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4ea6fcf5a192dbba54666f308bdace1c278e0c1
+refs/heads/master: 34e4e2fef4c7a2f7699b3d25e48d871d3ac4c3e7
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
@@ -1337,15 +1337,27 @@ int mod_sysfs_setup(struct module *mod,
 	kobject_put(&mod->mkobj.kobj);
 	return err;
 }
-#endif
+
+static void mod_sysfs_fini(struct module *mod)
+{
+	kobject_put(&mod->mkobj.kobj);
+}
+
+#else /* CONFIG_SYSFS */
+
+static void mod_sysfs_fini(struct module *mod)
+{
+}
+
+#endif /* CONFIG_SYSFS */
 
 static void mod_kobject_remove(struct module *mod)
 {
 	module_remove_modinfo_attrs(mod);
 	module_param_sysfs_remove(mod);
 	kobject_put(mod->mkobj.drivers_dir);
 	kobject_put(mod->holders_dir);
-	kobject_put(&mod->mkobj.kobj);
+	mod_sysfs_fini(mod);
 }
 
 /*