]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
rtc: sysfs: Bail out earlier if no new groups provided
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 2 Jul 2025 07:32:24 +0000 (10:32 +0300)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Tue, 22 Jul 2025 11:06:01 +0000 (13:06 +0200)
When there is no new groups provided, no need to reallocate memory,
copy the old ones and free them in order to do nothing. Do nothing
instead.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20250702073224.2684097-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/sysfs.c

index 86d1140b4f39dc81f31b42df45cf3739451b13fe..bf98a89d0e4e2585973b121e258ff9314f939b55 100644 (file)
@@ -314,17 +314,21 @@ int rtc_add_groups(struct rtc_device *rtc, const struct attribute_group **grps)
        size_t old_cnt = 0, add_cnt = 0, new_cnt;
        const struct attribute_group **groups, **old;
 
-       if (!grps)
+       if (grps) {
+               for (groups = grps; *groups; groups++)
+                       add_cnt++;
+               /* No need to modify current groups if nothing new is provided */
+               if (add_cnt == 0)
+                       return 0;
+       } else {
                return -EINVAL;
+       }
 
        groups = rtc->dev.groups;
        if (groups)
                for (; *groups; groups++)
                        old_cnt++;
 
-       for (groups = grps; *groups; groups++)
-               add_cnt++;
-
        new_cnt = old_cnt + add_cnt + 1;
        groups = devm_kcalloc(&rtc->dev, new_cnt, sizeof(*groups), GFP_KERNEL);
        if (!groups)