---

yaml --- r: 81559 b: refs/heads/master c: 28e9e47 h: refs/heads/master i: 81557: 7303513 81555: 0292cba 81551: 548ad45 v: v3
git-mirror · Jan 31, 2008 · 4495972 · 4495972
1 parent fe43cac
commit 4495972
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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: