Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-5
+1
-2
sound/soc/codecs/cs4265.c
+1
-2
sound/soc/codecs/cs4265.c
···
150
150
SOC_SINGLE("E to F Buffer Disable Switch", CS4265_SPDIF_CTL1,
151
151
6, 1, 0),
152
152
SOC_ENUM("C Data Access", cam_mode_enum),
153
-
SOC_SINGLE("SPDIF Switch", CS4265_SPDIF_CTL2, 5, 1, 1),
154
153
SOC_SINGLE("Validity Bit Control Switch", CS4265_SPDIF_CTL2,
155
154
3, 1, 0),
156
155
SOC_ENUM("SPDIF Mono/Stereo", spdif_mono_stereo_enum),
···
185
186
186
187
SND_SOC_DAPM_SWITCH("Loopback", SND_SOC_NOPM, 0, 0,
187
188
&loopback_ctl),
188
-
SND_SOC_DAPM_SWITCH("SPDIF", SND_SOC_NOPM, 0, 0,
189
+
SND_SOC_DAPM_SWITCH("SPDIF", CS4265_SPDIF_CTL2, 5, 1,
189
190
&spdif_switch),
190
191
SND_SOC_DAPM_SWITCH("DAC", CS4265_PWRCTL, 1, 1,
191
192
&dac_switch),
+2
-2
sound/soc/soc-ops.c
+2
-2
sound/soc/soc-ops.c
···
319
319
if (ucontrol->value.integer.value[0] < 0)
320
320
return -EINVAL;
321
321
val = ucontrol->value.integer.value[0];
322
-
if (mc->platform_max && val > mc->platform_max)
322
+
if (mc->platform_max && ((int)val + min) > mc->platform_max)
323
323
return -EINVAL;
324
324
if (val > max - min)
325
325
return -EINVAL;
···
332
332
if (ucontrol->value.integer.value[1] < 0)
333
333
return -EINVAL;
334
334
val2 = ucontrol->value.integer.value[1];
335
-
if (mc->platform_max && val2 > mc->platform_max)
335
+
if (mc->platform_max && ((int)val2 + min) > mc->platform_max)
336
336
return -EINVAL;
337
337
if (val2 > max - min)
338
338
return -EINVAL;
+1
-1
sound/x86/intel_hdmi_audio.c
+1
-1
sound/x86/intel_hdmi_audio.c
···
1261
1261
{
1262
1262
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
1263
1263
return remap_pfn_range(vma, vma->vm_start,
1264
-
substream->dma_buffer.addr >> PAGE_SHIFT,
1264
+
substream->runtime->dma_addr >> PAGE_SHIFT,
1265
1265
vma->vm_end - vma->vm_start, vma->vm_page_prot);
1266
1266
}
1267
1267