summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorDavid Henningsson <diwic@ubuntu.com>2018-04-21 14:57:40 +0200
committerTakashi Iwai <tiwai@suse.de>2018-04-23 08:47:03 +0200
commitf853dcaae2f5bbe021161e421bd1576845bae8f6 (patch)
treeb9111e9b2ee0ed562c3b4327ff171ee8e269f2a1 /sound
parent912e4c332037e7ed063c164985c36fb2b549ea3a (diff)
downloadlinux-f853dcaae2f5bbe021161e421bd1576845bae8f6.tar.gz
linux-f853dcaae2f5bbe021161e421bd1576845bae8f6.tar.bz2
linux-f853dcaae2f5bbe021161e421bd1576845bae8f6.zip
ALSA: core: Report audio_tstamp in snd_pcm_sync_ptr
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>
Diffstat (limited to 'sound')
-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 06aa499543b6..159706cf8f05 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -2754,6 +2754,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;