projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f4d32c5
)
ASoC: dapm: fix clock get name
author
Jerome Brunet
<jbrunet@baylibre.com>
Mon, 6 Nov 2023 10:37:09 +0000
(11:37 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 10:59:37 +0000
(11:59 +0100)
[ Upstream commit
4bdcbc31ad2112385ad525b28972c45015e6ad70
]
The name currently used to get the clock includes the dapm prefix.
It should use the name as provided to the widget, without the prefix.
Fixes:
3caac759681e
("ASoC: soc-dapm.c: fixup snd_soc_dapm_new_control_unlocked() error handling")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Link:
https://lore.kernel.org/r/20231106103712.703962-1-jbrunet@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/soc-dapm.c
patch
|
blob
|
history
diff --git
a/sound/soc/soc-dapm.c
b/sound/soc/soc-dapm.c
index
312e555
..
85e3bbf
100644
(file)
--- a/
sound/soc/soc-dapm.c
+++ b/
sound/soc/soc-dapm.c
@@
-3670,7
+3670,7
@@
snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,
dapm_pinctrl_event(w, NULL, SND_SOC_DAPM_POST_PMD);
break;
case snd_soc_dapm_clock_supply:
dapm_pinctrl_event(w, NULL, SND_SOC_DAPM_POST_PMD);
break;
case snd_soc_dapm_clock_supply:
- w->clk = devm_clk_get(dapm->dev, w->name);
+ w->clk = devm_clk_get(dapm->dev, w
idget
->name);
if (IS_ERR(w->clk)) {
ret = PTR_ERR(w->clk);
goto request_failed;
if (IS_ERR(w->clk)) {
ret = PTR_ERR(w->clk);
goto request_failed;