Commit 8d670948 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-5.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Hopefully the last PR for 5.17, including just a few small changes:
  an additional fix for ASoC ops boundary check and other minor
  device-specific fixes"

* tag 'sound-5.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: intel_hdmi: Fix reference to PCM buffer address
  ASoC: cs4265: Fix the duplicated control name
  ASoC: ops: Shift tested values in snd_soc_put_volsw() by +min
parents c4fc118a 0aa6b294

sound/soc/codecs/cs4265.c

+1 −2
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ static const struct snd_kcontrol_new cs4265_snd_controls[] = { 
	SOC_SINGLE("E to F Buffer Disable Switch", CS4265_SPDIF_CTL1,

				6, 1, 0),

	SOC_ENUM("C Data Access", cam_mode_enum),

	SOC_SINGLE("SPDIF Switch", CS4265_SPDIF_CTL2, 5, 1, 1),

	SOC_SINGLE("Validity Bit Control Switch", CS4265_SPDIF_CTL2,

				3, 1, 0),

	SOC_ENUM("SPDIF Mono/Stereo", spdif_mono_stereo_enum),
@@ -186,7 +185,7 @@ static const struct snd_soc_dapm_widget cs4265_dapm_widgets[] = { 


	SND_SOC_DAPM_SWITCH("Loopback", SND_SOC_NOPM, 0, 0,

			&loopback_ctl),

	SND_SOC_DAPM_SWITCH("SPDIF", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SWITCH("SPDIF", CS4265_SPDIF_CTL2, 5, 1,

			&spdif_switch),

	SND_SOC_DAPM_SWITCH("DAC", CS4265_PWRCTL, 1, 1,

			&dac_switch),

sound/soc/soc-ops.c

+2 −2
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, 
	if (ucontrol->value.integer.value[0] < 0)

		return -EINVAL;

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

	if (mc->platform_max && val > mc->platform_max)

	if (mc->platform_max && ((int)val + min) > mc->platform_max)

		return -EINVAL;

	if (val > max - min)

		return -EINVAL;
@@ -332,7 +332,7 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, 
		if (ucontrol->value.integer.value[1] < 0)

			return -EINVAL;

		val2 = ucontrol->value.integer.value[1];

		if (mc->platform_max && val2 > mc->platform_max)

		if (mc->platform_max && ((int)val2 + min) > mc->platform_max)

			return -EINVAL;

		if (val2 > max - min)

			return -EINVAL;

sound/x86/intel_hdmi_audio.c

+1 −1
Original line number Diff line number Diff line
@@ -1261,7 +1261,7 @@ static int had_pcm_mmap(struct snd_pcm_substream *substream, 
{

	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

	return remap_pfn_range(vma, vma->vm_start,

			substream->dma_buffer.addr >> PAGE_SHIFT,

			substream->runtime->dma_addr >> PAGE_SHIFT,

			vma->vm_end - vma->vm_start, vma->vm_page_prot);

}