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

Commit 8def12d9 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Back-merge of UAC3 fixes for applying further enhancements.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents c5f13d75 c99f0802

sound/core/control_compat.c

+1 −2
Original line number Diff line number Diff line
@@ -396,8 +396,7 @@ static int snd_ctl_elem_add_compat(struct snd_ctl_file *file, 
	if (copy_from_user(&data->id, &data32->id, sizeof(data->id)) ||

	    copy_from_user(&data->type, &data32->type, 3 * sizeof(u32)))

		goto error;

	if (get_user(data->owner, &data32->owner) ||

	    get_user(data->type, &data32->type))

	if (get_user(data->owner, &data32->owner))

		goto error;

	switch (data->type) {

	case SNDRV_CTL_ELEM_TYPE_BOOLEAN:

sound/core/pcm_compat.c

+2 −0
Original line number Diff line number Diff line
@@ -417,6 +417,8 @@ static int snd_pcm_ioctl_xfern_compat(struct snd_pcm_substream *substream, 
		return -ENOTTY;

	if (substream->stream != dir)

		return -EINVAL;

	if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN)

		return -EBADFD;



	if ((ch = substream->runtime->channels) > 128)

		return -EINVAL;

sound/core/seq/seq_virmidi.c

+2 −2
Original line number Diff line number Diff line
@@ -174,12 +174,12 @@ static void snd_virmidi_output_trigger(struct snd_rawmidi_substream *substream, 
			}

			return;

		}

		spin_lock_irqsave(&substream->runtime->lock, flags);

		if (vmidi->event.type != SNDRV_SEQ_EVENT_NONE) {

			if (snd_seq_kernel_client_dispatch(vmidi->client, &vmidi->event, in_atomic(), 0) < 0)

				return;

				goto out;

			vmidi->event.type = SNDRV_SEQ_EVENT_NONE;

		}

		spin_lock_irqsave(&substream->runtime->lock, flags);

		while (1) {

			count = __snd_rawmidi_transmit_peek(substream, buf, sizeof(buf));

			if (count <= 0)

sound/drivers/aloop.c

+15 −2
Original line number Diff line number Diff line
@@ -831,9 +831,11 @@ static int loopback_rate_shift_get(struct snd_kcontrol *kcontrol, 
{

	struct loopback *loopback = snd_kcontrol_chip(kcontrol);

	

	mutex_lock(&loopback->cable_lock);

	ucontrol->value.integer.value[0] =

		loopback->setup[kcontrol->id.subdevice]

			       [kcontrol->id.device].rate_shift;

	mutex_unlock(&loopback->cable_lock);

	return 0;

}
@@ -865,9 +867,11 @@ static int loopback_notify_get(struct snd_kcontrol *kcontrol, 
{

	struct loopback *loopback = snd_kcontrol_chip(kcontrol);

	

	mutex_lock(&loopback->cable_lock);

	ucontrol->value.integer.value[0] =

		loopback->setup[kcontrol->id.subdevice]

			       [kcontrol->id.device].notify;

	mutex_unlock(&loopback->cable_lock);

	return 0;

}
@@ -879,12 +883,14 @@ static int loopback_notify_put(struct snd_kcontrol *kcontrol, 
	int change = 0;



	val = ucontrol->value.integer.value[0] ? 1 : 0;

	mutex_lock(&loopback->cable_lock);

	if (val != loopback->setup[kcontrol->id.subdevice]

				[kcontrol->id.device].notify) {

		loopback->setup[kcontrol->id.subdevice]

			[kcontrol->id.device].notify = val;

		change = 1;

	}

	mutex_unlock(&loopback->cable_lock);

	return change;

}
@@ -892,15 +898,18 @@ static int loopback_active_get(struct snd_kcontrol *kcontrol, 
			       struct snd_ctl_elem_value *ucontrol)

{

	struct loopback *loopback = snd_kcontrol_chip(kcontrol);

	struct loopback_cable *cable = loopback->cables

			[kcontrol->id.subdevice][kcontrol->id.device ^ 1];

	struct loopback_cable *cable;



	unsigned int val = 0;



	mutex_lock(&loopback->cable_lock);

	cable = loopback->cables[kcontrol->id.subdevice][kcontrol->id.device ^ 1];

	if (cable != NULL) {

		unsigned int running = cable->running ^ cable->pause;



		val = (running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) ? 1 : 0;

	}

	mutex_unlock(&loopback->cable_lock);

	ucontrol->value.integer.value[0] = val;

	return 0;

}
@@ -943,9 +952,11 @@ static int loopback_rate_get(struct snd_kcontrol *kcontrol, 
{

	struct loopback *loopback = snd_kcontrol_chip(kcontrol);

	

	mutex_lock(&loopback->cable_lock);

	ucontrol->value.integer.value[0] =

		loopback->setup[kcontrol->id.subdevice]

			       [kcontrol->id.device].rate;

	mutex_unlock(&loopback->cable_lock);

	return 0;

}
@@ -965,9 +976,11 @@ static int loopback_channels_get(struct snd_kcontrol *kcontrol, 
{

	struct loopback *loopback = snd_kcontrol_chip(kcontrol);

	

	mutex_lock(&loopback->cable_lock);

	ucontrol->value.integer.value[0] =

		loopback->setup[kcontrol->id.subdevice]

			       [kcontrol->id.device].channels;

	mutex_unlock(&loopback->cable_lock);

	return 0;

}

sound/firewire/amdtp-stream.c

+3 −2
Original line number Diff line number Diff line
@@ -773,8 +773,6 @@ static void amdtp_stream_first_callback(struct fw_iso_context *context, 
	u32 cycle;

	unsigned int packets;



	s->max_payload_length = amdtp_stream_get_max_payload(s);



	/*

	 * For in-stream, first packet has come.

	 * For out-stream, prepared to transmit first packet
@@ -879,6 +877,9 @@ int amdtp_stream_start(struct amdtp_stream *s, int channel, int speed) 


	amdtp_stream_update(s);



	if (s->direction == AMDTP_IN_STREAM)

		s->max_payload_length = amdtp_stream_get_max_payload(s);



	if (s->flags & CIP_NO_HEADER)

		s->tag = TAG_NO_CIP_HEADER;

	else