Skip to content

Commit e69c7c1

Browse files
committed
Merge tag 'timers_urgent_for_v6.18_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Borislav Petkov: - Have timekeeping aux clocks sysfs interface setup function return an error code on failure instead of success * tag 'timers_urgent_for_v6.18_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: timekeeping: Fix error code in tk_aux_sysfs_init()
2 parents 6bda50f + c741816 commit e69c7c1

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

kernel/time/timekeeping.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3073,8 +3073,10 @@ static int __init tk_aux_sysfs_init(void)
30733073
char id[2] = { [0] = '0' + i, };
30743074
struct kobject *clk = kobject_create_and_add(id, auxo);
30753075

3076-
if (!clk)
3076+
if (!clk) {
3077+
ret = -ENOMEM;
30773078
goto err_clean;
3079+
}
30783080

30793081
ret = sysfs_create_group(clk, &aux_clock_enable_attr_group);
30803082
if (ret)

0 commit comments

Comments
 (0)