summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-07-16 18:07:30 +0200
committerTakashi Iwai <tiwai@suse.de>2014-07-21 09:08:18 +0200
commite58c295c041d17aa4298c1c8f618752f05d5c6ee (patch)
treec03b2def7351a41edfcf49fef267573030934b0e /sound/core
parent589008106b9b64153554c8f3f120ee512b134bb5 (diff)
downloadop-kernel-dev-e58c295c041d17aa4298c1c8f618752f05d5c6ee.zip
op-kernel-dev-e58c295c041d17aa4298c1c8f618752f05d5c6ee.tar.gz
ALSA: pcm: Add tstamp_type and proto to sw_params compat layer
I forgot to add the new fields in sw_params to 32bit compat layer. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/pcm_compat.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
index af49721..102e8fd 100644
--- a/sound/core/pcm_compat.c
+++ b/sound/core/pcm_compat.c
@@ -101,7 +101,9 @@ struct snd_pcm_sw_params32 {
u32 silence_threshold;
u32 silence_size;
u32 boundary;
- unsigned char reserved[64];
+ u32 proto;
+ u32 tstamp_type;
+ unsigned char reserved[56];
};
/* recalcuate the boundary within 32bit */
@@ -133,7 +135,9 @@ static int snd_pcm_ioctl_sw_params_compat(struct snd_pcm_substream *substream,
get_user(params.start_threshold, &src->start_threshold) ||
get_user(params.stop_threshold, &src->stop_threshold) ||
get_user(params.silence_threshold, &src->silence_threshold) ||
- get_user(params.silence_size, &src->silence_size))
+ get_user(params.silence_size, &src->silence_size) ||
+ get_user(params.tstamp_type, &src->tstamp_type) ||
+ get_user(params.proto, &src->proto))
return -EFAULT;
/*
* Check silent_size parameter. Since we have 64bit boundary,
OpenPOWER on IntegriCloud