Unverified Commit c93a73e5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15466 ASoC: mediatek: Fix missing of_node_put in mt2701_wm8960_machine_probe 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/45S27T7LJAG3RBD5MXOKSAKQF33DNBVJ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBP3KL 
 
Link:https://gitee.com/openeuler/kernel/pulls/15466

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents e876b90a 0b18732e

sound/soc/mediatek/mt2701/mt2701-wm8960.c

+7 −2
Original line number Diff line number Diff line
@@ -118,7 +118,8 @@ static int mt2701_wm8960_machine_probe(struct platform_device *pdev) 
	if (!codec_node) {

		dev_err(&pdev->dev,

			"Property 'audio-codec' missing or invalid\n");

		return -EINVAL;

		ret = -EINVAL;

		goto put_platform_node;

	}

	for (i = 0; i < card->num_links; i++) {

		if (mt2701_wm8960_dai_links[i].codec_name)
@@ -129,7 +130,7 @@ static int mt2701_wm8960_machine_probe(struct platform_device *pdev) 
	ret = snd_soc_of_parse_audio_routing(card, "audio-routing");

	if (ret) {

		dev_err(&pdev->dev, "failed to parse audio-routing: %d\n", ret);

		return ret;

		goto put_codec_node;

	}



	ret = devm_snd_soc_register_card(&pdev->dev, card);
@@ -137,6 +138,10 @@ static int mt2701_wm8960_machine_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",

			__func__, ret);



put_codec_node:

	of_node_put(codec_node);

put_platform_node:

	of_node_put(platform_node);

	return ret;

}