[2/2] merge fixup for simple-card-utils asoc-v6.14 vs asoc-v6.15

Commit Message

Kuninori Morimoto Feb. 28, 2025, 12:30 a.m. UTC

Signed-off-by: Kuninori Morimoto <[e-mail]>
---
 sound/soc/generic/simple-card-utils.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

Patch

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index cb658d052397..a1ccc300e68c 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -1102,11 +1102,8 @@  static int graph_get_dai_id(struct device_node *ep)
 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)
 {
-<<<<<<< HEAD
 	struct device *dev = simple_priv_to_dev(priv);
-=======
 	struct device_node *node;
->>>>>>> asoc/for-6.14
 	struct of_phandle_args args = {};
 	struct snd_soc_dai *dai;
 	int ret;
@@ -1157,15 +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);
-<<<<<<< HEAD
-	if (ret < 0)
-		goto end;
-=======
 	if (ret < 0) {
 		of_node_put(node);
-		return ret;
+		goto end;
 	}
->>>>>>> asoc/for-6.14
 
 parse_dai_end:
 	if (is_single_link)