diff mbox series

[v2,01/15] ASoC: soc-core: protect dlc->of_node under mutex

Message ID 87lefoo95n.wl-kuninori.morimoto.gx@renesas.com
State Accepted
Commit 065aa861b1243704b329a6d8407d8399614df6bd
Headers show
Series [v2,01/15] ASoC: soc-core: protect dlc->of_node under mutex | expand

Commit Message

Kuninori Morimoto July 10, 2023, 1:19 a.m. UTC 
dlc->of_node will be set on snd_soc_get_dlc(), but we want
1) protect it by mutex, 2) set only when successed.
This patch do it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/soc/soc-core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 1a0bde23f5e6..51791f8b2af3 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3264,8 +3264,6 @@  int snd_soc_get_dlc(const struct of_phandle_args *args, struct snd_soc_dai_link_
 	struct snd_soc_component *pos;
 	int ret = -EPROBE_DEFER;
 
-	dlc->of_node = args->np;
-
 	mutex_lock(&client_mutex);
 	for_each_component(pos) {
 		struct device_node *component_of_node = soc_component_to_node(pos);
@@ -3319,6 +3317,10 @@  int snd_soc_get_dlc(const struct of_phandle_args *args, struct snd_soc_dai_link_
 
 		break;
 	}
+
+	if (ret == 0)
+		dlc->of_node = args->np;
+
 	mutex_unlock(&client_mutex);
 	return ret;
 }