summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2012-10-27 21:55:27 +0200
committerTakashi Iwai <tiwai@suse.de>2012-10-28 09:52:37 +0100
commit9c7066aef4a5eb8e4063de28f06c508bf6f2963a (patch)
tree845a0f48868cf4b2917afe6582b1c4b15080d80b /sound/core
parent7dd7a2fd7eb147a610506f6c6f871c03908fc58a (diff)
downloadop-kernel-dev-9c7066aef4a5eb8e4063de28f06c508bf6f2963a.zip
op-kernel-dev-9c7066aef4a5eb8e4063de28f06c508bf6f2963a.tar.gz
ALSA: core: fix 64-bit SNDRV_PCM_IOCTL_STATUS ABI breakage
Commit 4eeaaeaea (ALSA: core: add hooks for audio timestamps) added the new audio_tstamp field to struct snd_pcm_status. However, struct timespec requires 64-bit alignment, so the 64-bit compiler would insert 32 bits of padding before this field, which broke SNDRV_PCM_IOCTL_STATUS with error messages like this: kernel: unknown ioctl = 0x80984120 To solve this, insert the padding explicitly so that it can be taken into account when calculating the ABI structure size. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/pcm_compat.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
index af2a3fd..af49721 100644
--- a/sound/core/pcm_compat.c
+++ b/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));
OpenPOWER on IntegriCloud