Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1ab70c1 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/monotonic' into for-next

parents 2d9772ef e58c295c

include/uapi/sound/asound.h

+2 −2
Original line number Diff line number Diff line
@@ -391,8 +391,8 @@ struct snd_pcm_sw_params { 
	snd_pcm_uframes_t silence_threshold;	/* min distance from noise for silence filling */

	snd_pcm_uframes_t silence_size;		/* silence block size */

	snd_pcm_uframes_t boundary;		/* pointers wrap point */

	unsigned int tstamp_type;		/* timestamp type */

	int pads;				/* alignment, reserved */

	unsigned int proto;			/* protocol version */

	unsigned int tstamp_type;		/* timestamp type (req. proto >= 2.0.12) */

	unsigned char reserved[56];		/* reserved for future */

};

sound/core/pcm_compat.c

+6 −2
Original line number Diff line number Diff line
@@ -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,

sound/core/pcm_native.c

+4 −2
Original line number Diff line number Diff line
@@ -543,7 +543,8 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream, 


	if (params->tstamp_mode > SNDRV_PCM_TSTAMP_LAST)

		return -EINVAL;

	if (params->tstamp_type > SNDRV_PCM_TSTAMP_TYPE_LAST)

	if (params->proto >= SNDRV_PROTOCOL_VERSION(2, 0, 12) &&

	    params->tstamp_type > SNDRV_PCM_TSTAMP_TYPE_LAST)

		return -EINVAL;

	if (params->avail_min == 0)

		return -EINVAL;
@@ -559,6 +560,7 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream, 
	err = 0;

	snd_pcm_stream_lock_irq(substream);

	runtime->tstamp_mode = params->tstamp_mode;

	if (params->proto >= SNDRV_PROTOCOL_VERSION(2, 0, 12))

		runtime->tstamp_type = params->tstamp_type;

	runtime->period_step = params->period_step;

	runtime->control->avail_min = params->avail_min;