---

yaml --- r: 342571 b: refs/heads/master c: 9c7066a h: refs/heads/master i: 342569: d386aba 342567: 978b4d6 v: v3
git-mirror · Oct 28, 2012 · 29fb74f · 29fb74f
1 parent 2693dc0
commit 29fb74f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dd7a2fd7eb147a610506f6c6f871c03908fc58a
+refs/heads/master: 9c7066aef4a5eb8e4063de28f06c508bf6f2963a
diff --git a/trunk/include/uapi/sound/asound.h b/trunk/include/uapi/sound/asound.h
@@ -407,8 +407,9 @@ struct snd_pcm_status {
 	snd_pcm_uframes_t avail_max;	/* max frames available on hw since last status */
 	snd_pcm_uframes_t overrange;	/* count of ADC (capture) overrange detections from last status */
 	snd_pcm_state_t suspended_state; /* suspended stream state */
+	__u32 reserved_alignment;	/* must be filled with zero */
 	struct timespec audio_tstamp;	/* from sample counter or wall clock */
-	unsigned char reserved[60-sizeof(struct timespec)]; /* must be filled with zero */
+	unsigned char reserved[56-sizeof(struct timespec)]; /* must be filled with zero */
 };
 
 struct snd_pcm_mmap_status {

diff --git a/trunk/sound/core/pcm_compat.c b/trunk/sound/core/pcm_compat.c
@@ -190,8 +190,9 @@ struct snd_pcm_status32 {
 	u32 avail_max;
 	u32 overrange;
 	s32 suspended_state;
+	u32 reserved_alignment;
 	struct compat_timespec audio_tstamp;
-	unsigned char reserved[60-sizeof(struct compat_timespec)];
+	unsigned char reserved[56-sizeof(struct compat_timespec)];
 } __attribute__((packed));