Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[mirror_ubuntu-bionic-kernel.git] / fs / sysfs / group.c

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index 7d2a860ba788f7bc35cb985c42737066f7a21be7..2554d8835b480b9706067d1375559defecfbeae1 100644 (file)
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -99,7 +99,7 @@ static int internal_create_group(struct kobject *kobj, int update,
                return -EINVAL;
        if (!grp->attrs && !grp->bin_attrs) {
                WARN(1, "sysfs: (bin_)attrs not set by subsystem for group: %s/%s\n",
-                       kobj->name, grp->name ? "" : grp->name);
+                       kobj->name, grp->name ?: "");
                return -EINVAL;
        }
        if (grp->name) {