hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: Ux500: Dispose of device nodes correctly 

When of_parse_phandle() is used to find a device node, its
reference count is incremented by the helper. Once we're
finished with them, it's our responsibly to ensure they
are freed in the correct manor.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Lee Jones 2012-10-15 14:13:25 +01:00 committed by Mark Brown
parent ddffeb8c4d
commit 39013bd60e
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/ux500/mop500.c
View File

@ -57,6 +57,20 @@ static struct snd_soc_card mop500_card = {
.num_links = ARRAY_SIZE(mop500_dai_links), .num_links = ARRAY_SIZE(mop500_dai_links),
}; };
static void mop500_of_node_put(void)
{
int i;
for (i = 0; i < 2; i++) {
if (mop500_dai_links[i].cpu_of_node)
of_node_put((struct device_node *)
mop500_dai_links[i].cpu_of_node);
if (mop500_dai_links[i].codec_of_node)
of_node_put((struct device_node *)
mop500_dai_links[i].codec_of_node);
}
}
static int __devinit mop500_of_probe(struct platform_device *pdev, static int __devinit mop500_of_probe(struct platform_device *pdev,
struct device_node *np) struct device_node *np)
{ {
@ -69,6 +83,7 @@ static int __devinit mop500_of_probe(struct platform_device *pdev,
if (!(msp_np[0] && msp_np[1] && codec_np)) { if (!(msp_np[0] && msp_np[1] && codec_np)) {
dev_err(&pdev->dev, "Phandle missing or invalid\n"); dev_err(&pdev->dev, "Phandle missing or invalid\n");
mop500_of_node_put();
return -EINVAL; return -EINVAL;
} }
@ -83,6 +98,7 @@ static int __devinit mop500_of_probe(struct platform_device *pdev,
return 0; return 0;
} }
static int __devinit mop500_probe(struct platform_device *pdev) static int __devinit mop500_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
@ -128,6 +144,7 @@ static int __devexit mop500_remove(struct platform_device *pdev)
snd_soc_unregister_card(mop500_card); snd_soc_unregister_card(mop500_card);
mop500_ab8500_remove(mop500_card); mop500_ab8500_remove(mop500_card);
mop500_of_node_put();
return 0; return 0;
} }