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

Pull sound fixes from Takashi Iwai:
"A few last-minute ASoC fixes and MAINTAINERS update.

All look small, obvious and nice-to-have fixes for 6.11-final"

* tag 'sound-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ASoC: meson: axg-card: fix 'use-after-free'
ASoC: codecs: avoid possible garbage value in peb2466_reg_read()
MAINTAINERS: update Pierre Bossart's email and role
ASoC: tas2781: fix to save the dsp bin file name into the correct array in case name_prefix is not NULL
ASoC: Intel: soc-acpi-intel-mtl-match: add missing empty item
ASoC: Intel: soc-acpi-intel-lnl-match: add missing empty item

+1
.mailmap
··· 529 529 Peter A Jonsson <pj@ludd.ltu.se> 530 530 Peter Oruba <peter.oruba@amd.com> 531 531 Peter Oruba <peter@oruba.de> 532 + Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com> 532 533 Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com> 533 534 Praveen BP <praveenbp@ti.com> 534 535 Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com> <pradeepc@codeaurora.org>
+3 -3
MAINTAINERS
··· 11156 11156 11157 11157 INTEL ASoC DRIVERS 11158 11158 M: Cezary Rojewski <cezary.rojewski@intel.com> 11159 - M: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> 11160 11159 M: Liam Girdwood <liam.r.girdwood@linux.intel.com> 11161 11160 M: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> 11162 11161 M: Bard Liao <yung-chuan.liao@linux.intel.com> 11163 11162 M: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> 11164 11163 M: Kai Vehmanen <kai.vehmanen@linux.intel.com> 11164 + R: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> 11165 11165 L: alsa-devel@alsa-project.org (moderated for non-subscribers) 11166 11166 S: Supported 11167 11167 F: sound/soc/intel/ ··· 21391 21391 F: tools/sound/dapm-graph 21392 21392 21393 21393 SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS 21394 - M: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> 21395 21394 M: Liam Girdwood <lgirdwood@gmail.com> 21396 21395 M: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> 21397 21396 M: Bard Liao <yung-chuan.liao@linux.intel.com> 21398 21397 M: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> 21399 21398 M: Daniel Baluta <daniel.baluta@nxp.com> 21400 21399 R: Kai Vehmanen <kai.vehmanen@linux.intel.com> 21400 + R: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> 21401 21401 L: sound-open-firmware@alsa-project.org (moderated for non-subscribers) 21402 21402 S: Supported 21403 21403 W: https://github.com/thesofproject/linux/ ··· 21406 21406 SOUNDWIRE SUBSYSTEM 21407 21407 M: Vinod Koul <vkoul@kernel.org> 21408 21408 M: Bard Liao <yung-chuan.liao@linux.intel.com> 21409 - R: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> 21409 + R: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> 21410 21410 R: Sanyog Kale <sanyog.r.kale@intel.com> 21411 21411 L: alsa-devel@alsa-project.org (moderated for non-subscribers) 21412 21412 S: Supported
+2 -1
sound/soc/codecs/peb2466.c
··· 229 229 case PEB2466_CMD_XOP: 230 230 case PEB2466_CMD_SOP: 231 231 ret = peb2466_read_byte(peb2466, reg, &tmp); 232 - *val = tmp; 232 + if (!ret) 233 + *val = tmp; 233 234 break; 234 235 default: 235 236 dev_err(&peb2466->spi->dev, "Not a XOP or SOP command\n");
+1 -1
sound/soc/codecs/tas2781-i2c.c
··· 502 502 */ 503 503 tas_priv->fw_state = TASDEVICE_RCA_FW_OK; 504 504 if (tas_priv->name_prefix) 505 - scnprintf(tas_priv->rca_binaryname, 64, "%s-%s_coef.bin", 505 + scnprintf(tas_priv->coef_binaryname, 64, "%s-%s_coef.bin", 506 506 tas_priv->name_prefix, tas_priv->dev_name); 507 507 else 508 508 scnprintf(tas_priv->coef_binaryname, 64, "%s_coef.bin",
+1
sound/soc/intel/common/soc-acpi-intel-lnl-match.c
··· 208 208 .num_adr = ARRAY_SIZE(cs42l43_0_adr), 209 209 .adr_d = cs42l43_0_adr, 210 210 }, 211 + {} 211 212 }; 212 213 213 214 static const struct snd_soc_acpi_link_adr lnl_rvp[] = {
+1
sound/soc/intel/common/soc-acpi-intel-mtl-match.c
··· 674 674 .num_adr = ARRAY_SIZE(cs42l43_0_adr), 675 675 .adr_d = cs42l43_0_adr, 676 676 }, 677 + {} 677 678 }; 678 679 679 680 static const struct snd_soc_acpi_link_adr mtl_cs42l43_cs35l56[] = {
+2 -1
sound/soc/meson/axg-card.c
··· 104 104 int *index) 105 105 { 106 106 struct meson_card *priv = snd_soc_card_get_drvdata(card); 107 - struct snd_soc_dai_link *pad = &card->dai_link[*index]; 107 + struct snd_soc_dai_link *pad; 108 108 struct snd_soc_dai_link *lb; 109 109 struct snd_soc_dai_link_component *dlc; 110 110 int ret; ··· 114 114 if (ret) 115 115 return ret; 116 116 117 + pad = &card->dai_link[*index]; 117 118 lb = &card->dai_link[*index + 1]; 118 119 119 120 lb->name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-lb", pad->name);