Commit 57719771 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d9bc2265 134536c2

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -529,6 +529,7 @@ Pavankumar Kondeti <quic_pkondeti@quicinc.com> <pkondeti@codeaurora.org> 
Peter A Jonsson <pj@ludd.ltu.se>

Peter Oruba <peter.oruba@amd.com>

Peter Oruba <peter@oruba.de>

Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com>

Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com> <pradeepc@codeaurora.org>

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -11156,12 +11156,12 @@ F: drivers/gpio/gpio-i8255.h 








INTEL ASoC DRIVERS









M:	Cezary Rojewski <cezary.rojewski@intel.com>









M:	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>









M:	Liam Girdwood <liam.r.girdwood@linux.intel.com>









M:	Peter Ujfalusi <peter.ujfalusi@linux.intel.com>









M:	Bard Liao <yung-chuan.liao@linux.intel.com>









M:	Ranjani Sridharan <ranjani.sridharan@linux.intel.com>









M:	Kai Vehmanen <kai.vehmanen@linux.intel.com>









R:	Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









S:	Supported









F:	sound/soc/intel/








@@ -21391,13 +21391,13 @@ S:	Maintained







F:	tools/sound/dapm-graph

















SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS









M:	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>









M:	Liam Girdwood <lgirdwood@gmail.com>









M:	Peter Ujfalusi <peter.ujfalusi@linux.intel.com>









M:	Bard Liao <yung-chuan.liao@linux.intel.com>









M:	Ranjani Sridharan <ranjani.sridharan@linux.intel.com>









M:	Daniel Baluta <daniel.baluta@nxp.com>









R:	Kai Vehmanen <kai.vehmanen@linux.intel.com>









R:	Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>









L:	sound-open-firmware@alsa-project.org (moderated for non-subscribers)









S:	Supported









W:	https://github.com/thesofproject/linux/








@@ -21406,7 +21406,7 @@ F:	sound/soc/sof/







SOUNDWIRE SUBSYSTEM









M:	Vinod Koul <vkoul@kernel.org>









M:	Bard Liao <yung-chuan.liao@linux.intel.com>









R:	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>









R:	Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>









R:	Sanyog Kale <sanyog.r.kale@intel.com>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









S:	Supported

























sound/soc/codecs/peb2466.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -229,6 +229,7 @@ static int peb2466_reg_read(void *context, unsigned int reg, unsigned int *val)







	case PEB2466_CMD_XOP:









	case PEB2466_CMD_SOP:









		ret = peb2466_read_byte(peb2466, reg, &tmp);









		if (!ret)









			*val = tmp;









		break;









	default:
































sound/soc/codecs/tas2781-i2c.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -502,7 +502,7 @@ static void tasdevice_fw_ready(const struct firmware *fmw,







	 */









	tas_priv->fw_state = TASDEVICE_RCA_FW_OK;









	if (tas_priv->name_prefix)









		scnprintf(tas_priv->rca_binaryname, 64, "%s-%s_coef.bin",









		scnprintf(tas_priv->coef_binaryname, 64, "%s-%s_coef.bin",









			tas_priv->name_prefix, tas_priv->dev_name);









	else









		scnprintf(tas_priv->coef_binaryname, 64, "%s_coef.bin",
































sound/soc/intel/common/soc-acpi-intel-lnl-match.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -208,6 +208,7 @@ static const struct snd_soc_acpi_link_adr lnl_cs42l43_l0[] = {







		.num_adr = ARRAY_SIZE(cs42l43_0_adr),









		.adr_d = cs42l43_0_adr,









	},









	{}









};



















static const struct snd_soc_acpi_link_adr lnl_rvp[] = {