]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ALSA: core: Report audio_tstamp in snd_pcm_sync_ptr
authorDavid Henningsson <diwic@ubuntu.com>
Sat, 21 Apr 2018 12:57:40 +0000 (14:57 +0200)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:36:38 +0000 (21:36 -0400)
[ Upstream commit f853dcaae2f5bbe021161e421bd1576845bae8f6 ]

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: 4eeaaeaea1ce ("ALSA: core: add hooks for audio timestamps")
Signed-off-by: David Henningsson <diwic@ubuntu.com>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Cc: <stable@vger.kernel.org> # v3.8+
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
sound/core/pcm_native.c

index 8801e4b12750e5f47bf4d7984e429145a2bcbbad..889087808ebe9409df5e7a26590c36375bfdc4d7 100644 (file)
@@ -2729,6 +2729,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;