From 29fb74fa209645eeea109f8226cec8035cd880b7 Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Sat, 27 Oct 2012 21:55:27 +0200
Subject: [PATCH] --- yaml --- r: 342571 b: refs/heads/master c:
 9c7066aef4a5eb8e4063de28f06c508bf6f2963a h: refs/heads/master i:   342569:
 d386aba2d0efe2e0ec1451b8b70c5863176e526a   342567:
 978b4d68b9ae9c5e9ae74f25fd4cd791ec685180 v: v3

---
 [refs]                            | 2 +-
 trunk/include/uapi/sound/asound.h | 3 ++-
 trunk/sound/core/pcm_compat.c     | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d9bfe03c69cf..ecf567c1c735 100644
--- 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
index 85b2e4dde883..515b8fcd1ca9 100644
--- 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
index af2a3fdb8828..af49721ba0e3 100644
--- 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));