Unverified Commit 5efc1c90 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

ASoC: codecs: lpass-rx-macro: Handle component name prefix 



Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names,
to include also the component's name prefix.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20231023095428.166563-5-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ecea1812

sound/soc/codecs/lpass-rx-macro.c

+3 −3
Original line number Diff line number Diff line
@@ -2906,14 +2906,14 @@ static int rx_macro_enable_echo(struct snd_soc_dapm_widget *w, 


	val = snd_soc_component_read(component,

			CDC_RX_INP_MUX_RX_MIX_CFG4);

	if (!(strcmp(w->name, "RX MIX TX0 MUX")))

	if (!(snd_soc_dapm_widget_name_cmp(w, "RX MIX TX0 MUX")))

		ec_tx = ((val & 0xf0) >> 0x4) - 1;

	else if (!(strcmp(w->name, "RX MIX TX1 MUX")))

	else if (!(snd_soc_dapm_widget_name_cmp(w, "RX MIX TX1 MUX")))

		ec_tx = (val & 0x0f) - 1;



	val = snd_soc_component_read(component,

			CDC_RX_INP_MUX_RX_MIX_CFG5);

	if (!(strcmp(w->name, "RX MIX TX2 MUX")))

	if (!(snd_soc_dapm_widget_name_cmp(w, "RX MIX TX2 MUX")))

		ec_tx = (val & 0x0f) - 1;



	if (ec_tx < 0 || (ec_tx >= RX_MACRO_EC_MUX_MAX)) {