summary refs log tree commit diff
path: root/sound/soc
diff options
context:
space:
mode:
authorPaul Cercueil <paul@crapouillou.net>2022-10-25 16:01:49 +0100
committerMark Brown <broonie@kernel.org>2022-10-26 14:17:34 +0100
commit1683d3282f240336a2b4b6b541d435facfe8bbb6 (patch)
tree3431e08e100e2d1336147a27fe2fd5b507140ce6 /sound/soc
parente9441675edc1bb8dbfadacf68aafacca60d65a25 (diff)
downloadlinux-1683d3282f240336a2b4b6b541d435facfe8bbb6.tar.gz
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: 3caac759681e ("ASoC: soc-dapm.c: fixup snd_soc_dapm_new_control_unlocked() error handling")
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20221025150149.113129-1-paul@crapouillou.net
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d515e7a78ea8..879cf1be67a9 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -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;