diff options
| author | Mark Brown <broonie@kernel.org> | 2025-03-14 02:31:06 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-03-14 02:31:06 +0000 |
| commit | e0afd7d370c6f577c1dacb1512e18048eabf322e (patch) | |
| tree | ebe7e98755569509f132d61d1deabac38544e5fc /sound/soc/generic | |
| parent | f0066c8d1d3298e9f9d136a365139bac733e84c5 (diff) | |
| parent | de74ec718e0788e1998eb7289ad07970e27cae27 (diff) | |
ASoC: Merge up fixes
Merge the for-6.14 to resolve conflicts with simple-card-utils.c due to
parallel delveopment.
Diffstat (limited to 'sound/soc/generic')
| -rw-r--r-- | sound/soc/generic/simple-card-utils.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 51e0e434514d..a1ccc300e68c 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -1103,6 +1103,7 @@ int graph_util_parse_dai(struct simple_util_priv *priv, struct device_node *ep, struct snd_soc_dai_link_component *dlc, int *is_single_link) { struct device *dev = simple_priv_to_dev(priv); + struct device_node *node; struct of_phandle_args args = {}; struct snd_soc_dai *dai; int ret; @@ -1110,7 +1111,7 @@ int graph_util_parse_dai(struct simple_util_priv *priv, struct device_node *ep, if (!ep) return 0; - struct device_node *node __free(device_node) = of_graph_get_port_parent(ep); + node = of_graph_get_port_parent(ep); /* * Try to find from DAI node @@ -1153,8 +1154,10 @@ int graph_util_parse_dai(struct simple_util_priv *priv, struct device_node *ep, * if he unbinded CPU or Codec. */ ret = snd_soc_get_dlc(&args, dlc); - if (ret < 0) + if (ret < 0) { + of_node_put(node); goto end; + } parse_dai_end: if (is_single_link) |