Merge branch 'for-linus' into for-next

Pull 6.11 fixes to 6.12-devel branch

Signed-off-by: Takashi Iwai <[email protected]>

Author: tiwai

.mailmap

@@ -525,6 +525,7 @@ Pavankumar Kondeti <[email protected]> <[email protected]>
 Peter A Jonsson <[email protected]>
 Peter Oruba <[email protected]>
 Peter Oruba <[email protected]>
+Pierre-Louis Bossart <[email protected]> <[email protected]>
 Pratyush Anand <[email protected]> <[email protected]>
 Praveen BP <[email protected]>
 Pradeep Kumar Chitrapu <[email protected]> <[email protected]>

MAINTAINERS

@@ -11141,12 +11141,12 @@ F:	drivers/gpio/gpio-i8255.h
 
 INTEL ASoC DRIVERS
 M:	Cezary Rojewski <[email protected]>
-M:	Pierre-Louis Bossart <[email protected]>
 M:	Liam Girdwood <[email protected]>
 M:	Peter Ujfalusi <[email protected]>
 M:	Bard Liao <[email protected]>
 M:	Ranjani Sridharan <[email protected]>
 M:	Kai Vehmanen <[email protected]>
+R:	Pierre-Louis Bossart <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 S:	Supported
 F:	sound/soc/intel/
@@ -21350,13 +21350,13 @@ S:	Maintained
 F:	tools/sound/dapm-graph
 
 SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
-M:	Pierre-Louis Bossart <[email protected]>
 M:	Liam Girdwood <[email protected]>
 M:	Peter Ujfalusi <[email protected]>
 M:	Bard Liao <[email protected]>
 M:	Ranjani Sridharan <[email protected]>
 M:	Daniel Baluta <[email protected]>
 R:	Kai Vehmanen <[email protected]>
+R:	Pierre-Louis Bossart <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 S:	Supported
 W:	https://github.com/thesofproject/linux/
@@ -21365,7 +21365,7 @@ F:	sound/soc/sof/
 SOUNDWIRE SUBSYSTEM
 M:	Vinod Koul <[email protected]>
 M:	Bard Liao <[email protected]>
-R:	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+R:	Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
 R:	Sanyog Kale <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 S:	Supported

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");

sound/soc/codecs/tas2781-i2c.c

@@ -1370,7 +1370,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

@@ -267,6 +267,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_cs42l43_l0_cs35l56_l3[] = {

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[] = {

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);