Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Some last-minute fixes. All changes are device-specific small fixes or
quirks, safe to apply"
* tag 'sound-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ASoC: mediatek: common: fix device and OF node leak
ALSA: hda/realtek: Fix mute LED mask on HP OMEN 16 laptop
ALSA: usb-audio: qcom: Adjust mutex unlock order
ASoC: SDCA: correct the calculation of the maximum init table size
ASoC: rt5650: Eliminate the high frequency glitch
ASoC: SOF: Intel: PTL: Add the sdw_process_wakeen op
ALSA: hda/realtek - Add mute LED support for HP Pavilion 15-eg0xxx
ALSA: hda/realtek - Add mute LED support for HP Victus 15-fa0xxx
ASoC: mediatek: mt8365-dai-i2s: pass correct size to mt8365_dai_set_priv
+14
-7
+3
-1
sound/pci/hda/patch_realtek.c
+3
-1
sound/pci/hda/patch_realtek.c
···
4753
4753
if (action == HDA_FIXUP_ACT_PRE_PROBE) {
4754
4754
spec->mute_led_polarity = 0;
4755
4755
spec->mute_led_coef.idx = 0x0b;
4756
-
spec->mute_led_coef.mask = 1 << 3;
4756
+
spec->mute_led_coef.mask = 3 << 2;
4757
4757
spec->mute_led_coef.on = 1 << 3;
4758
4758
spec->mute_led_coef.off = 0;
4759
4759
snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);
···
10694
10694
SND_PCI_QUIRK(0x103c, 0x8788, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED),
10695
10695
SND_PCI_QUIRK(0x103c, 0x87b7, "HP Laptop 14-fq0xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
10696
10696
SND_PCI_QUIRK(0x103c, 0x87c8, "HP", ALC287_FIXUP_HP_GPIO_LED),
10697
+
SND_PCI_QUIRK(0x103c, 0x87cc, "HP Pavilion 15-eg0xxx", ALC287_FIXUP_HP_GPIO_LED),
10697
10698
SND_PCI_QUIRK(0x103c, 0x87d3, "HP Laptop 15-gw0xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
10698
10699
SND_PCI_QUIRK(0x103c, 0x87df, "HP ProBook 430 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
10699
10700
SND_PCI_QUIRK(0x103c, 0x87e5, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
···
10773
10772
SND_PCI_QUIRK(0x103c, 0x8a2e, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),
10774
10773
SND_PCI_QUIRK(0x103c, 0x8a30, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
10775
10774
SND_PCI_QUIRK(0x103c, 0x8a31, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
10775
+
SND_PCI_QUIRK(0x103c, 0x8a4f, "HP Victus 15-fa0xxx (MB 8A4F)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),
10776
10776
SND_PCI_QUIRK(0x103c, 0x8a6e, "HP EDNA 360", ALC287_FIXUP_CS35L41_I2C_4),
10777
10777
SND_PCI_QUIRK(0x103c, 0x8a74, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
10778
10778
SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),
+1
sound/soc/codecs/rt5645.c
+1
sound/soc/codecs/rt5645.c
+4
sound/soc/mediatek/common/mtk-soundcard-driver.c
+4
sound/soc/mediatek/common/mtk-soundcard-driver.c
···
262
262
soc_card_data->accdet = accdet_comp;
263
263
else
264
264
dev_err(&pdev->dev, "No sound component found from mediatek,accdet property\n");
265
+
266
+
put_device(&accdet_pdev->dev);
265
267
} else {
266
268
dev_err(&pdev->dev, "No device found from mediatek,accdet property\n");
267
269
}
270
+
271
+
of_node_put(accdet_node);
268
272
}
269
273
270
274
platform_node = of_parse_phandle(pdev->dev.of_node, "mediatek,platform", 0);
+1
-2
sound/soc/mediatek/mt8365/mt8365-dai-i2s.c
+1
-2
sound/soc/mediatek/mt8365/mt8365-dai-i2s.c
···
812
812
static int mt8365_dai_i2s_set_priv(struct mtk_base_afe *afe)
813
813
{
814
814
int i, ret;
815
-
struct mt8365_afe_private *afe_priv = afe->platform_priv;
816
815
817
816
for (i = 0; i < DAI_I2S_NUM; i++) {
818
817
ret = mt8365_dai_set_priv(afe, mt8365_i2s_priv[i].id,
819
-
sizeof(*afe_priv),
818
+
sizeof(mt8365_i2s_priv[i]),
820
819
&mt8365_i2s_priv[i]);
821
820
if (ret)
822
821
return ret;
+1
-1
sound/soc/sdca/sdca_functions.c
+1
-1
sound/soc/sdca/sdca_functions.c
···
211
211
} else if (num_init_writes % sizeof(*raw) != 0) {
212
212
dev_err(dev, "%pfwP: init table size invalid\n", function_node);
213
213
return -EINVAL;
214
-
} else if (num_init_writes > SDCA_MAX_INIT_COUNT) {
214
+
} else if ((num_init_writes / sizeof(*raw)) > SDCA_MAX_INIT_COUNT) {
215
215
dev_err(dev, "%pfwP: maximum init table size exceeded\n", function_node);
216
216
return -EINVAL;
217
217
}
+1
sound/soc/sof/intel/ptl.c
+1
sound/soc/sof/intel/ptl.c
···
117
117
.read_sdw_lcount = hda_sdw_check_lcount_ext,
118
118
.check_sdw_irq = lnl_dsp_check_sdw_irq,
119
119
.check_sdw_wakeen_irq = lnl_sdw_check_wakeen_irq,
120
+
.sdw_process_wakeen = hda_sdw_process_wakeen_common,
120
121
.check_ipc_irq = mtl_dsp_check_ipc_irq,
121
122
.check_mic_privacy_irq = sof_ptl_check_mic_privacy_irq,
122
123
.process_mic_privacy = sof_ptl_process_mic_privacy,
+3
-3
sound/usb/qcom/qc_audio_offload.c
+3
-3
sound/usb/qcom/qc_audio_offload.c
···
825
825
}
826
826
}
827
827
828
-
mutex_unlock(&qdev_mutex);
829
828
mutex_unlock(&chip->mutex);
829
+
mutex_unlock(&qdev_mutex);
830
830
831
831
return 0;
832
832
}
···
1865
1865
1866
1866
/* Device has already been cleaned up, or never populated */
1867
1867
if (!dev->chip) {
1868
-
mutex_unlock(&qdev_mutex);
1869
1868
mutex_unlock(&chip->mutex);
1869
+
mutex_unlock(&qdev_mutex);
1870
1870
return;
1871
1871
}
1872
1872
···
1921
1921
1922
1922
uaudio_send_disconnect_ind(chip);
1923
1923
1924
-
mutex_unlock(&qdev_mutex);
1925
1924
mutex_unlock(&chip->mutex);
1925
+
mutex_unlock(&qdev_mutex);
1926
1926
}
1927
1927
1928
1928
static struct snd_usb_platform_ops offload_ops = {