1 files changed, 12 insertions, 3 deletions

diff --git a/kernel/params.c b/kernel/params.c
index 91aea7aa532e..f406655d6653 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -547,6 +547,7 @@ static void __init kernel_param_sysfs_setup(const char *name,
                                             unsigned int name_skip)
 {
         struct module_kobject *mk;
+        int ret;
 
         mk = kzalloc(sizeof(struct module_kobject), GFP_KERNEL);
         BUG_ON(!mk);
@@ -554,7 +555,8 @@ static void __init kernel_param_sysfs_setup(const char *name,
         mk->mod = THIS_MODULE;
         kobj_set_kset_s(mk, module_subsys);
         kobject_set_name(&mk->kobj, name);
-        kobject_register(&mk->kobj);
+        ret = kobject_register(&mk->kobj);
+        BUG_ON(ret < 0);
 
         /* no need to keep the kobject if no parameter is exported */
         if (!param_sysfs_setup(mk, kparam, num_params, name_skip)) {
@@ -684,13 +686,20 @@ decl_subsys(module, &module_ktype, NULL);
  */
 static int __init param_sysfs_init(void)
 {
-        subsystem_register(&module_subsys);
+        int ret;
+
+        ret = subsystem_register(&module_subsys);
+        if (ret < 0) {
+                printk(KERN_WARNING "%s (%d): subsystem_register error: %d\n",
+                        __FILE__, __LINE__, ret);
+                return ret;
+        }
 
         param_sysfs_builtin();
 
         return 0;
 }
-__initcall(param_sysfs_init);
+subsys_initcall(param_sysfs_init);
 
 EXPORT_SYMBOL(param_set_byte);
 EXPORT_SYMBOL(param_get_byte);