diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-11-30 08:47:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-11-30 08:47:10 -0800 |
| commit | e69c7c175115c51c7f95394fc55425a395b3af59 (patch) | |
| tree | eda96dee5b666e2cba563107d8546a85cada2ac6 | |
| parent | 6bda50f4333fa61c07f04f790fdd4e2c9f4ca610 (diff) | |
| parent | c7418164b463056bf4327b6a2abe638b78250f13 (diff) | |
| download | linux-next-stable.tar.gz | |
Merge tag 'timers_urgent_for_v6.18_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tipstable
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()
| -rw-r--r-- | kernel/time/timekeeping.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 08e0943b54da6f..4790da895203c2 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -3073,8 +3073,10 @@ static int __init tk_aux_sysfs_init(void) char id[2] = { [0] = '0' + i, }; struct kobject *clk = kobject_create_and_add(id, auxo); - if (!clk) + if (!clk) { + ret = -ENOMEM; goto err_clean; + } ret = sysfs_create_group(clk, &aux_clock_enable_attr_group); if (ret) |