Skip to content

Commit 5771977

Browse files
committed
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
2 parents d9bc226 + 134536c commit 5771977

File tree

7 files changed

+11
-6
lines changed

7 files changed

+11
-6
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,7 @@ Pavankumar Kondeti <quic_pkondeti@quicinc.com> <pkondeti@codeaurora.org>
529529
Peter A Jonsson <pj@ludd.ltu.se>
530530
Peter Oruba <peter.oruba@amd.com>
531531
Peter Oruba <peter@oruba.de>
532+
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com>
532533
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
533534
Praveen BP <praveenbp@ti.com>
534535
Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com> <pradeepc@codeaurora.org>

MAINTAINERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11156,12 +11156,12 @@ F: drivers/gpio/gpio-i8255.h
1115611156

1115711157
INTEL ASoC DRIVERS
1115811158
M: Cezary Rojewski <cezary.rojewski@intel.com>
11159-
M: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
1116011159
M: Liam Girdwood <liam.r.girdwood@linux.intel.com>
1116111160
M: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1116211161
M: Bard Liao <yung-chuan.liao@linux.intel.com>
1116311162
M: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
1116411163
M: Kai Vehmanen <kai.vehmanen@linux.intel.com>
11164+
R: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
1116511165
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
1116611166
S: Supported
1116711167
F: sound/soc/intel/
@@ -21391,13 +21391,13 @@ S: Maintained
2139121391
F: tools/sound/dapm-graph
2139221392

2139321393
SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
21394-
M: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2139521394
M: Liam Girdwood <lgirdwood@gmail.com>
2139621395
M: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
2139721396
M: Bard Liao <yung-chuan.liao@linux.intel.com>
2139821397
M: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2139921398
M: Daniel Baluta <daniel.baluta@nxp.com>
2140021399
R: Kai Vehmanen <kai.vehmanen@linux.intel.com>
21400+
R: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
2140121401
L: sound-open-firmware@alsa-project.org (moderated for non-subscribers)
2140221402
S: Supported
2140321403
W: https://github.com/thesofproject/linux/
@@ -21406,7 +21406,7 @@ F: sound/soc/sof/
2140621406
SOUNDWIRE SUBSYSTEM
2140721407
M: Vinod Koul <vkoul@kernel.org>
2140821408
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>
2141021410
R: Sanyog Kale <sanyog.r.kale@intel.com>
2141121411
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
2141221412
S: Supported

sound/soc/codecs/peb2466.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ static int peb2466_reg_read(void *context, unsigned int reg, unsigned int *val)
229229
case PEB2466_CMD_XOP:
230230
case PEB2466_CMD_SOP:
231231
ret = peb2466_read_byte(peb2466, reg, &tmp);
232-
*val = tmp;
232+
if (!ret)
233+
*val = tmp;
233234
break;
234235
default:
235236
dev_err(&peb2466->spi->dev, "Not a XOP or SOP command\n");

sound/soc/codecs/tas2781-i2c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ static void tasdevice_fw_ready(const struct firmware *fmw,
502502
*/
503503
tas_priv->fw_state = TASDEVICE_RCA_FW_OK;
504504
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",
506506
tas_priv->name_prefix, tas_priv->dev_name);
507507
else
508508
scnprintf(tas_priv->coef_binaryname, 64, "%s_coef.bin",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ static const struct snd_soc_acpi_link_adr lnl_cs42l43_l0[] = {
208208
.num_adr = ARRAY_SIZE(cs42l43_0_adr),
209209
.adr_d = cs42l43_0_adr,
210210
},
211+
{}
211212
};
212213

213214
static const struct snd_soc_acpi_link_adr lnl_rvp[] = {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,7 @@ static const struct snd_soc_acpi_link_adr mtl_cs42l43_l0[] = {
674674
.num_adr = ARRAY_SIZE(cs42l43_0_adr),
675675
.adr_d = cs42l43_0_adr,
676676
},
677+
{}
677678
};
678679

679680
static const struct snd_soc_acpi_link_adr mtl_cs42l43_cs35l56[] = {

sound/soc/meson/axg-card.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card,
104104
int *index)
105105
{
106106
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;
108108
struct snd_soc_dai_link *lb;
109109
struct snd_soc_dai_link_component *dlc;
110110
int ret;
@@ -114,6 +114,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card,
114114
if (ret)
115115
return ret;
116116

117+
pad = &card->dai_link[*index];
117118
lb = &card->dai_link[*index + 1];
118119

119120
lb->name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-lb", pad->name);

0 commit comments

Comments
 (0)