diff --git a/[refs] b/[refs]
index 1a303c7693eb..cdf81baca9eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfa0e9a07cd31f3858239dbc93011b82780acf4b
+refs/heads/master: 1cc5f7142eca352109895fe20b1fc6405dd17727
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
index 2a19cd47c046..b7fe6e840963 100644
--- a/trunk/kernel/module.c
+++ b/trunk/kernel/module.c
@@ -1054,6 +1054,12 @@ static int mod_sysfs_setup(struct module *mod,
 {
 	int err;
 
+	if (!module_subsys.kset.subsys) {
+		printk(KERN_ERR "%s: module_subsys not initialized\n",
+		       mod->name);
+		err = -EINVAL;
+		goto out;
+	}
 	memset(&mod->mkobj.kobj, 0, sizeof(mod->mkobj.kobj));
 	err = kobject_set_name(&mod->mkobj.kobj, "%s", mod->name);
 	if (err)