ASoC: samsung: arndale: Add missing OF node dereferencing (fb629fa2) · Commits · 戴 / test

sound/soc/samsung/arndale_rt5631.c

+30 −4

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		// Author: Claude <claude@insginal.co.kr>

		#include <linux/module.h>
		#include <linux/of_device.h>
		#include <linux/platform_device.h>
		#include <linux/clk.h>

		@@ -74,6 +75,17 @@ static struct snd_soc_card arndale_rt5631 = {
		.num_links = ARRAY_SIZE(arndale_rt5631_dai),
		};

		static void arndale_put_of_nodes(struct snd_soc_card *card)
		{
		struct snd_soc_dai_link *dai_link;
		int i;

		for_each_card_prelinks(card, i, dai_link) {
		of_node_put(dai_link->cpus->of_node);
		of_node_put(dai_link->codecs->of_node);
		}
		}

		static int arndale_audio_probe(struct platform_device *pdev)
		{
		int n, ret;
		@@ -103,18 +115,31 @@ static int arndale_audio_probe(struct platform_device *pdev)
		if (!arndale_rt5631_dai[0].codecs->of_node) {
		dev_err(&pdev->dev,
		"Property 'samsung,audio-codec' missing or invalid\n");
		return -EINVAL;
		ret = -EINVAL;
		goto err_put_of_nodes;
		}
		}

		ret = devm_snd_soc_register_card(card->dev, card);

		if (ret)
		if (ret) {
		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
		goto err_put_of_nodes;
		}
		return 0;

		err_put_of_nodes:
		arndale_put_of_nodes(card);
		return ret;
		}

		static int arndale_audio_remove(struct platform_device *pdev)
		{
		struct snd_soc_card *card = platform_get_drvdata(pdev);

		arndale_put_of_nodes(card);
		return 0;
		}

		static const struct of_device_id samsung_arndale_rt5631_of_match[] __maybe_unused = {
		{ .compatible = "samsung,arndale-rt5631", },
		{ .compatible = "samsung,arndale-alc5631", },
		@@ -129,6 +154,7 @@ static struct platform_driver arndale_audio_driver = {
		.of_match_table = of_match_ptr(samsung_arndale_rt5631_of_match),
		},
		.probe = arndale_audio_probe,
		.remove = arndale_audio_remove,
		};

		module_platform_driver(arndale_audio_driver);

Admin message