Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[sfrench/cifs-2.6.git] / security / inode.c

diff --git a/security/inode.c b/security/inode.c
index dfc5978d4298eafe66f1fbcf512ef9afe635132c..acc6cf0d79001fa06d53c5b592fb4c90f5ea88a2 100644 (file)
--- a/security/inode.c
+++ b/security/inode.c
@@ -321,13 +321,13 @@ static int __init securityfs_init(void)
 {
        int retval;
 
-       security_kobj = kobject_create_and_add("security", &kernel_subsys.kobj);
+       security_kobj = kobject_create_and_add("security", kernel_kobj);
        if (!security_kobj)
                return -EINVAL;
 
        retval = register_filesystem(&fs_type);
        if (retval)
-               kobject_unregister(security_kobj);
+               kobject_put(security_kobj);
        return retval;
 }