Commit f9993480 authored Jan 11, 2020 by Pierre-Louis Bossart Committed by Takashi Iwai Jan 12, 2020

ALSA: timer: fix nsec/sec initialization confusion



GCC reports a warning with W=1:

sound/core/timer.c: In function ‘snd_timer_user_read’:
sound/core/timer.c:2219:19: warning: initialized field overwritten
[-Woverride-init]
 2219 |     .tstamp_sec = tread->tstamp_nsec,
      |                   ^~~~~
sound/core/timer.c:2219:19: note: (near initialization for
‘(anonymous).tstamp_sec’)

Assigning nsec values to sec fields is problematic in general, even
more so when the initial goal was to survive the 2030 timer
armageddon.

Fix by using the proper field in the initialization

Cc: Baolin Wang <baolin.wang@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Fixes: 07094ae6 ("ALSA: Avoid using timespec for struct snd_timer_tread")
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20200111203325.20498-1-pierre-louis.bossart@linux.intel.com


Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 3cdca6d6

sound/core/timer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2216,7 +2216,7 @@ static ssize_t snd_timer_user_read(struct file file, char __user buffer,
		tread32 = (struct snd_timer_tread32) {
		.event = tread->event,
		.tstamp_sec = tread->tstamp_sec,
		.tstamp_sec = tread->tstamp_nsec,
		.tstamp_nsec = tread->tstamp_nsec,
		.val = tread->val,
		};

Admin message