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

ASoC: tegra_alc5632: fix device_node refcounting 

tegra_alc5632_probe() increments reference count of device nodes
with of_parse_phandle(), but there is no code decrementing them
in the driver.

The patch adds of_node_put() to tegra_alc5632_remove() and
to error handling paths in the probe.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Alexey Khoroshilov 2018-07-28 00:06:59 +03:00 committed by Mark Brown
parent 7464d3faf6
commit 4321723648
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/tegra/tegra_alc5632.c
View File

@ -190,14 +190,14 @@ static int tegra_alc5632_probe(struct platform_device *pdev)
dev_err(&pdev->dev,
"Property 'nvidia,i2s-controller' missing or invalid\n");
ret = -EINVAL;
goto err;
goto err_put_codec_of_node;
}
tegra_alc5632_dai.platform_of_node = tegra_alc5632_dai.cpu_of_node;
ret = tegra_asoc_utils_init(&alc5632->util_data, &pdev->dev);
if (ret)
goto err;
goto err_put_cpu_of_node;
ret = snd_soc_register_card(card);
if (ret) {
@ -210,6 +210,13 @@ static int tegra_alc5632_probe(struct platform_device *pdev)
err_fini_utils:
tegra_asoc_utils_fini(&alc5632->util_data);
err_put_cpu_of_node:
of_node_put(tegra_alc5632_dai.cpu_of_node);
tegra_alc5632_dai.cpu_of_node = NULL;
tegra_alc5632_dai.platform_of_node = NULL;
err_put_codec_of_node:
of_node_put(tegra_alc5632_dai.codec_of_node);
tegra_alc5632_dai.codec_of_node = NULL;
err:
return ret;
}
@ -223,6 +230,12 @@ static int tegra_alc5632_remove(struct platform_device *pdev)
tegra_asoc_utils_fini(&machine->util_data);
of_node_put(tegra_alc5632_dai.cpu_of_node);
tegra_alc5632_dai.cpu_of_node = NULL;
tegra_alc5632_dai.platform_of_node = NULL;
of_node_put(tegra_alc5632_dai.codec_of_node);
tegra_alc5632_dai.codec_of_node = NULL;
return 0;
}