summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorDavid Henningsson <diwic@ubuntu.com>2018-04-21 14:57:40 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-02 07:59:54 -0700
commitcd85ad112ecf79cb61a3b93ae1388375caf05a6d (patch)
tree5bc56e71397ab81eae71fe2a50b17bad8e2029f6 /sound/core
parent31473a9e85383b99960537c813df4e4a3d730262 (diff)
downloadlinux-stable-cd85ad112ecf79cb61a3b93ae1388375caf05a6d.tar.gz
linux-stable-cd85ad112ecf79cb61a3b93ae1388375caf05a6d.tar.bz2
linux-stable-cd85ad112ecf79cb61a3b93ae1388375caf05a6d.zip
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: 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/core')
-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 a4bae2ce4a0c..e2d78f8af2ab 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -2695,6 +2695,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;