[GIT PULL] sound fixes for 6.11-rc7
From: Takashi Iwai
Date: Sat Sep 14 2024 - 04:15:29 EST
Linus,
please pull sound fixes for v6.11 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-6.11
The topmost commit is 134536c21275bb3410cd1f10c5e369d30702741d
----------------------------------------------------------------
sound fixes for 6.11
A few last-minute ASoC fixes and MAINTAINERS update.
All look small, obvious and nice-to-have fixes for 6.11-final.
----------------------------------------------------------------
Arseniy Krasnov (1):
ASoC: meson: axg-card: fix 'use-after-free'
Bard Liao (2):
ASoC: Intel: soc-acpi-intel-lnl-match: add missing empty item
ASoC: Intel: soc-acpi-intel-mtl-match: add missing empty item
Pierre-Louis Bossart (1):
MAINTAINERS: update Pierre Bossart's email and role
Shenghao Ding (1):
ASoC: tas2781: fix to save the dsp bin file name into the correct array in case name_prefix is not NULL
Su Hui (1):
ASoC: codecs: avoid possible garbage value in peb2466_reg_read()
---
.mailmap | 1 +
MAINTAINERS | 6 +++---
sound/soc/codecs/peb2466.c | 3 ++-
sound/soc/codecs/tas2781-i2c.c | 2 +-
sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 1 +
sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 1 +
sound/soc/meson/axg-card.c | 3 ++-
7 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/.mailmap b/.mailmap
index f01d7bfca2a0..7c7f171d0e55 100644
--- a/.mailmap
+++ b/.mailmap
@@ -529,6 +529,7 @@ Pavankumar Kondeti <quic_pkondeti@xxxxxxxxxxx> <pkondeti@xxxxxxxxxxxxxx>
Peter A Jonsson <pj@xxxxxxxxxxx>
Peter Oruba <peter.oruba@xxxxxxx>
Peter Oruba <peter@xxxxxxxx>
+Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxx> <pierre-louis.bossart@xxxxxxxxxxxxxxx>
Pratyush Anand <pratyush.anand@xxxxxxxxx> <pratyush.anand@xxxxxx>
Praveen BP <praveenbp@xxxxxx>
Pradeep Kumar Chitrapu <quic_pradeepc@xxxxxxxxxxx> <pradeepc@xxxxxxxxxxxxxx>
diff --git a/MAINTAINERS b/MAINTAINERS
index f70987f7e462..cc40a9d9b8cd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11156,12 +11156,12 @@ F: drivers/gpio/gpio-i8255.h
INTEL ASoC DRIVERS
M: Cezary Rojewski <cezary.rojewski@xxxxxxxxx>
-M: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx>
M: Liam Girdwood <liam.r.girdwood@xxxxxxxxxxxxxxx>
M: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxxxxxxxx>
M: Bard Liao <yung-chuan.liao@xxxxxxxxxxxxxxx>
M: Ranjani Sridharan <ranjani.sridharan@xxxxxxxxxxxxxxx>
M: Kai Vehmanen <kai.vehmanen@xxxxxxxxxxxxxxx>
+R: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxx>
L: alsa-devel@xxxxxxxxxxxxxxxx (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@xxxxxxxxxxxxxxx>
M: Liam Girdwood <lgirdwood@xxxxxxxxx>
M: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxxxxxxxx>
M: Bard Liao <yung-chuan.liao@xxxxxxxxxxxxxxx>
M: Ranjani Sridharan <ranjani.sridharan@xxxxxxxxxxxxxxx>
M: Daniel Baluta <daniel.baluta@xxxxxxx>
R: Kai Vehmanen <kai.vehmanen@xxxxxxxxxxxxxxx>
+R: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxx>
L: sound-open-firmware@xxxxxxxxxxxxxxxx (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@xxxxxxxxxx>
M: Bard Liao <yung-chuan.liao@xxxxxxxxxxxxxxx>
-R: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx>
+R: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxx>
R: Sanyog Kale <sanyog.r.kale@xxxxxxxxx>
L: alsa-devel@xxxxxxxxxxxxxxxx (moderated for non-subscribers)
S: Supported
diff --git a/sound/soc/codecs/peb2466.c b/sound/soc/codecs/peb2466.c
index 76ee7e3f4d9b..67ea70cef0c7 100644
--- a/sound/soc/codecs/peb2466.c
+++ b/sound/soc/codecs/peb2466.c
@@ -229,7 +229,8 @@ 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);
- *val = tmp;
+ if (!ret)
+ *val = tmp;
break;
default:
dev_err(&peb2466->spi->dev, "Not a XOP or SOP command\n");
diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c
index e79d613745b4..cf8bc7ede6c7 100644
--- a/sound/soc/codecs/tas2781-i2c.c
+++ b/sound/soc/codecs/tas2781-i2c.c
@@ -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",
diff --git a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
index e6ffcd5be6c5..edfb668d0580 100644
--- a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
@@ -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[] = {
diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
index 8e0ae3635a35..d4435a34a3a3 100644
--- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
@@ -674,6 +674,7 @@ static const struct snd_soc_acpi_link_adr mtl_cs42l43_l0[] = {
.num_adr = ARRAY_SIZE(cs42l43_0_adr),
.adr_d = cs42l43_0_adr,
},
+ {}
};
static const struct snd_soc_acpi_link_adr mtl_cs42l43_cs35l56[] = {
diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c
index 8c5605c1e34e..eb0302f20740 100644
--- a/sound/soc/meson/axg-card.c
+++ b/sound/soc/meson/axg-card.c
@@ -104,7 +104,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card,
int *index)
{
struct meson_card *priv = snd_soc_card_get_drvdata(card);
- struct snd_soc_dai_link *pad = &card->dai_link[*index];
+ struct snd_soc_dai_link *pad;
struct snd_soc_dai_link *lb;
struct snd_soc_dai_link_component *dlc;
int ret;
@@ -114,6 +114,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card,
if (ret)
return ret;
+ pad = &card->dai_link[*index];
lb = &card->dai_link[*index + 1];
lb->name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-lb", pad->name);