From 4495972e32c26b5b1eb1802da5b3d18e34c8b621 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 17 Dec 2007 09:02:22 +0100 Subject: [PATCH] --- yaml --- r: 81559 b: refs/heads/master c: 28e9e47384d333239a8335b439a92a13d29f91d6 h: refs/heads/master i: 81557: 730351377fc7e0e3526cab2c5a77d12b9e108c0c 81555: 0292cbac7b64aebe70bb9002e2a20a4b66fd457e 81551: 548ad45bee7f2cdeb65d5f14aa6b5380c972bfcb v: v3 --- [refs] | 2 +- trunk/include/sound/asound.h | 1 + trunk/sound/core/pcm_native.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 30dbb2ffa809..b8f5f5946d67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f85bf29c9435baf927e1817e6b43c9429b84f822 +refs/heads/master: 28e9e47384d333239a8335b439a92a13d29f91d6 diff --git a/trunk/include/sound/asound.h b/trunk/include/sound/asound.h index 475eb71d65ba..eda5c63ea547 100644 --- a/trunk/include/sound/asound.h +++ b/trunk/include/sound/asound.h @@ -443,6 +443,7 @@ enum { enum { SNDRV_PCM_IOCTL_PVERSION = _IOR('A', 0x00, int), SNDRV_PCM_IOCTL_INFO = _IOR('A', 0x01, struct snd_pcm_info), + SNDRV_PCM_IOCTL_TSTAMP = _IOW('A', 0x02, int), SNDRV_PCM_IOCTL_TTSTAMP = _IOW('A', 0x03, int), SNDRV_PCM_IOCTL_HW_REFINE = _IOWR('A', 0x10, struct snd_pcm_hw_params), SNDRV_PCM_IOCTL_HW_PARAMS = _IOWR('A', 0x11, struct snd_pcm_hw_params), diff --git a/trunk/sound/core/pcm_native.c b/trunk/sound/core/pcm_native.c index 7fb7c921b27d..2e7b1e63db94 100644 --- a/trunk/sound/core/pcm_native.c +++ b/trunk/sound/core/pcm_native.c @@ -2546,6 +2546,8 @@ static int snd_pcm_common_ioctl1(struct file *file, return put_user(SNDRV_PCM_VERSION, (int __user *)arg) ? -EFAULT : 0; case SNDRV_PCM_IOCTL_INFO: return snd_pcm_info_user(substream, arg); + case SNDRV_PCM_IOCTL_TSTAMP: /* just for compatibility */ + return 0; case SNDRV_PCM_IOCTL_TTSTAMP: return snd_pcm_tstamp(substream, arg); case SNDRV_PCM_IOCTL_HW_REFINE: