UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: samsung: arndale: Add missing OF node dereferencing 

Ensure there is no OF node references kept when the driver
is removed/unbound.

Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20190920130218.32690-3-s.nawrocki@samsung.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Sylwester Nawrocki 2019-09-20 15:02:11 +02:00 committed by Mark Brown
parent 147162f575
commit fb629fa258
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sound/soc/samsung/arndale_rt5631.c
View File

@ -5,6 +5,7 @@
// Author: Claude <claude@insginal.co.kr> // Author: Claude <claude@insginal.co.kr>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clk.h> #include <linux/clk.h>
@ -74,6 +75,17 @@ static struct snd_soc_card arndale_rt5631 = {
.num_links = ARRAY_SIZE(arndale_rt5631_dai), .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) static int arndale_audio_probe(struct platform_device *pdev)
{ {
int n, ret; int n, ret;
@ -103,18 +115,31 @@ static int arndale_audio_probe(struct platform_device *pdev)
if (!arndale_rt5631_dai[0].codecs->of_node) { if (!arndale_rt5631_dai[0].codecs->of_node) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Property 'samsung,audio-codec' missing or invalid\n"); "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); ret = devm_snd_soc_register_card(card->dev, card);
if (ret) {
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
goto err_put_of_nodes;
}
return 0;
if (ret) err_put_of_nodes:
dev_err(&pdev->dev, "snd_soc_register_card() failed:%d\n", ret); arndale_put_of_nodes(card);
return ret; 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 = { static const struct of_device_id samsung_arndale_rt5631_of_match[] __maybe_unused = {
{ .compatible = "samsung,arndale-rt5631", }, { .compatible = "samsung,arndale-rt5631", },
{ .compatible = "samsung,arndale-alc5631", }, { .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), .of_match_table = of_match_ptr(samsung_arndale_rt5631_of_match),
}, },
.probe = arndale_audio_probe, .probe = arndale_audio_probe,
.remove = arndale_audio_remove,
}; };
module_platform_driver(arndale_audio_driver); module_platform_driver(arndale_audio_driver);