summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Henningsson <diwic@ubuntu.com>2018-04-21 14:57:40 +0200
committerSasha Levin <alexander.levin@microsoft.com>2018-05-22 21:36:38 -0400
commit13cc4cf41d6bd031b714b7fa5561d937533ff526 (patch)
treeaa981c53cd4a8becba6a8d0da09299933b8e1722
parentf3f63233615f29d80b0956003222ec962b0a7875 (diff)
downloadlinux-stable-13cc4cf41d6bd031b714b7fa5561d937533ff526.tar.gz
ALSA: core: Report audio_tstamp in snd_pcm_sync_ptr
[ 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>
-rw-r--r--sound/core/pcm_native.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 8801e4b12750..889087808ebe 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -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;