diff --git a/[refs] b/[refs]
index edf0952f4470..224187dcbf73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5631f2c18f4b2845b3e97df1c659c5094a17605f
+refs/heads/master: 3a198886ab5f228fcbebb9ace803d8b99721d49a
diff --git a/trunk/fs/sysfs/dir.c b/trunk/fs/sysfs/dir.c
index 8ddc1021c79a..35a36d39fa2c 100644
--- a/trunk/fs/sysfs/dir.c
+++ b/trunk/fs/sysfs/dir.c
@@ -729,6 +729,9 @@ int sysfs_create_dir(struct kobject * kobj)
 	else
 		parent_sd = &sysfs_root;
 
+	if (!parent_sd)
+		return -ENOENT;
+
 	if (sysfs_ns_type(parent_sd))
 		ns = kobj->ktype->namespace(kobj);
 	type = sysfs_read_ns_type(kobj);