diff --git a/[refs] b/[refs]
index f935bc5d9966..146d3a3b16a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f285ea058001ef534f9e53a21aad42c2952bbad5
+refs/heads/master: 74c5b597e9c2fc728c61582afdea4971a5c8ed8f
diff --git a/trunk/kernel/params.c b/trunk/kernel/params.c
index effbaaedd7f3..4e57732fcfb4 100644
--- a/trunk/kernel/params.c
+++ b/trunk/kernel/params.c
@@ -567,7 +567,12 @@ static void __init kernel_param_sysfs_setup(const char *name,
 	kobject_set_name(&mk->kobj, name);
 	kobject_init(&mk->kobj);
 	ret = kobject_add(&mk->kobj);
-	BUG_ON(ret < 0);
+	if (ret) {
+		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");
+		return;
+	}
 	param_sysfs_setup(mk, kparam, num_params, name_skip);
 	kobject_uevent(&mk->kobj, KOBJ_ADD);
 }