Commit e69c7c17 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 6bda50f4 c7418164

kernel/time/timekeeping.c

+3 −1
Original line number Diff line number Diff line
@@ -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)