Skip to content

Commit f82eb06

Browse files
krzkbroonie
authored andcommitted
ASoC: tegra: machine: 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: Krzysztof Kozlowski <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 317dd0d commit f82eb06

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

sound/soc/tegra/tegra_asoc_machine.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,23 @@ static int tegra_machine_event(struct snd_soc_dapm_widget *w,
8181
struct snd_soc_dapm_context *dapm = w->dapm;
8282
struct tegra_machine *machine = snd_soc_card_get_drvdata(dapm->card);
8383

84-
if (!strcmp(w->name, "Int Spk") || !strcmp(w->name, "Speakers"))
84+
if (!snd_soc_dapm_widget_name_cmp(w, "Int Spk") ||
85+
!snd_soc_dapm_widget_name_cmp(w, "Speakers"))
8586
gpiod_set_value_cansleep(machine->gpiod_spkr_en,
8687
SND_SOC_DAPM_EVENT_ON(event));
8788

88-
if (!strcmp(w->name, "Mic Jack") || !strcmp(w->name, "Headset Mic"))
89+
if (!snd_soc_dapm_widget_name_cmp(w, "Mic Jack") ||
90+
!snd_soc_dapm_widget_name_cmp(w, "Headset Mic"))
8991
gpiod_set_value_cansleep(machine->gpiod_ext_mic_en,
9092
SND_SOC_DAPM_EVENT_ON(event));
9193

92-
if (!strcmp(w->name, "Int Mic") || !strcmp(w->name, "Internal Mic 2"))
94+
if (!snd_soc_dapm_widget_name_cmp(w, "Int Mic") ||
95+
!snd_soc_dapm_widget_name_cmp(w, "Internal Mic 2"))
9396
gpiod_set_value_cansleep(machine->gpiod_int_mic_en,
9497
SND_SOC_DAPM_EVENT_ON(event));
9598

96-
if (!strcmp(w->name, "Headphone") || !strcmp(w->name, "Headphone Jack"))
99+
if (!snd_soc_dapm_widget_name_cmp(w, "Headphone") ||
100+
!snd_soc_dapm_widget_name_cmp(w, "Headphone Jack"))
97101
gpiod_set_value_cansleep(machine->gpiod_hp_mute,
98102
!SND_SOC_DAPM_EVENT_ON(event));
99103

0 commit comments

Comments
 (0)