Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10a249ca authored by David Henningsson's avatar David Henningsson Committed by Greg Kroah-Hartman
Browse files

ALSA: core: Report audio_tstamp in snd_pcm_sync_ptr 



commit f853dcaae2f5bbe021161e421bd1576845bae8f6 upstream.

It looks like a simple mistake that this struct member
was forgotten.

Audio_tstamp isn't used much, and on some archs (such as x86) this
ioctl is not used by default, so that might be the reason why this
has slipped for so long.

Fixes: 4eeaaeae ("ALSA: core: add hooks for audio timestamps")
Signed-off-by: default avatarDavid Henningsson <diwic@ubuntu.com>
Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Cc: <stable@vger.kernel.org> # v3.8+
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 210392f6

sound/core/pcm_native.c

+1 −0
Original line number Diff line number Diff line
@@ -2727,6 +2727,7 @@ static int snd_pcm_sync_ptr(struct snd_pcm_substream *substream, 
	sync_ptr.s.status.hw_ptr = status->hw_ptr;

	sync_ptr.s.status.tstamp = status->tstamp;

	sync_ptr.s.status.suspended_state = status->suspended_state;

	sync_ptr.s.status.audio_tstamp = status->audio_tstamp;

	snd_pcm_stream_unlock_irq(substream);

	if (copy_to_user(_sync_ptr, &sync_ptr, sizeof(sync_ptr)))

		return -EFAULT;