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");