1 files changed, 9 insertions, 2 deletions

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 8acf82bba44c..a271c87c4472 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -523,7 +523,11 @@ int sysfs_add_file_to_group(struct kobject *kobj,
         struct sysfs_dirent *dir_sd;
         int error;
 
-        dir_sd = sysfs_get_dirent(kobj->sd, group);
+        if (group)
+                dir_sd = sysfs_get_dirent(kobj->sd, group);
+        else
+                dir_sd = sysfs_get(kobj->sd);
+
         if (!dir_sd)
                 return -ENOENT;
 
@@ -611,7 +615,10 @@ void sysfs_remove_file_from_group(struct kobject *kobj,
 {
         struct sysfs_dirent *dir_sd;
 
-        dir_sd = sysfs_get_dirent(kobj->sd, group);
+        if (group)
+                dir_sd = sysfs_get_dirent(kobj->sd, group);
+        else
+                dir_sd = sysfs_get(kobj->sd);
         if (dir_sd) {
                 sysfs_hash_and_remove(dir_sd, attr->name);
                 sysfs_put(dir_sd);