diff options
author | Takashi Iwai <tiwai@suse.de> | 2021-03-18 14:12:11 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2021-03-18 14:12:11 +0100 |
commit | f4df9ee6d7f329d32d756e54f78c084c7e509b24 (patch) | |
tree | 5a89fe8d7e218989f4bf10eeff1409dc38985ac2 /sound/soc/codecs/lpass-rx-macro.c | |
parent | 53b861bec737c189cc14ec3b5785d0f13445ac0f (diff) | |
parent | f9dc51cc6676e0360dfcb1836b3d426a3ccf3093 (diff) |
Merge tag 'asoc-fix-v5.12-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.12
Quite a lot of mostly platform specific fixes here, the only one which
is generic is a fix for regressions on devices with more complex
clocking support with simple-card. There's also a few new device IDs
and platform quirks.
Diffstat (limited to 'sound/soc/codecs/lpass-rx-macro.c')
-rw-r--r-- | sound/soc/codecs/lpass-rx-macro.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index c9c21d22c2c4..8c04b3b2c907 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -2895,7 +2895,7 @@ static int rx_macro_enable_echo(struct snd_soc_dapm_widget *w, { struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); u16 val, ec_hq_reg; - int ec_tx; + int ec_tx = -1; val = snd_soc_component_read(component, CDC_RX_INP_MUX_RX_MIX_CFG4); |