diff options
author | Takashi Iwai <tiwai@suse.de> | 2024-09-14 10:16:12 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2024-09-14 10:16:12 +0200 |
commit | 64c0ce555ad2d84f497f5f584ddd31e87ac690a2 (patch) | |
tree | 36413d636cc2f09bbec2a00036550b87d88724d9 /sound/soc/codecs | |
parent | 1a529af6f81e54f15df162a0c703459937941c54 (diff) | |
parent | 134536c21275bb3410cd1f10c5e369d30702741d (diff) |
Merge branch 'for-linus' into for-next
Pull 6.11 fixes to 6.12-devel branch
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/peb2466.c | 3 | ||||
-rw-r--r-- | sound/soc/codecs/tas2781-i2c.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/codecs/peb2466.c b/sound/soc/codecs/peb2466.c index b67cfad4fc32..74b628ae1964 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 8a8d97dd7f25..d0ba7cbe03a8 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/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", |