Unverified Commit 1683d328 authored by Paul Cercueil's avatar Paul Cercueil Committed by Mark Brown
Browse files

ASoC: dapm: Don't use prefix for regulator name 



When a component has a prefix, and uses a SND_SOC_DAPM_REGULATOR_SUPPLY,
the name of the regulator should not use the prefix, otherwise it won't
be properly matched in the DT/ACPI.

Fixes: 3caac759 ("ASoC: soc-dapm.c: fixup snd_soc_dapm_new_control_unlocked() error handling")
Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20221025150149.113129-1-paul@crapouillou.net


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

sound/soc/soc-dapm.c

+1 −1
Original line number Diff line number Diff line
@@ -3645,7 +3645,7 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, 


	switch (w->id) {

	case snd_soc_dapm_regulator_supply:

		w->regulator = devm_regulator_get(dapm->dev, w->name);

		w->regulator = devm_regulator_get(dapm->dev, widget->name);

		if (IS_ERR(w->regulator)) {

			ret = PTR_ERR(w->regulator);

			goto request_failed;