Unverified Commit a56df73b authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Mark Brown
Browse files

ASoC: rockchip: put device_node on remove 



snd_rk_mc_probe() gets a couple of device nodes with of_parse_phandle(),
but there is no release of them.

The patch adds remove handler and proper error handling in the probe.

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

Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 187e01d0

sound/soc/rockchip/rockchip_rt5645.c

+24 −3
Original line number Diff line number Diff line
@@ -181,7 +181,8 @@ static int snd_rk_mc_probe(struct platform_device *pdev) 
	if (!rk_dailink.cpu_of_node) {

		dev_err(&pdev->dev,

			"Property 'rockchip,i2s-controller' missing or invalid\n");

		return -EINVAL;

		ret = -EINVAL;

		goto put_codec_of_node;

	}



	rk_dailink.platform_of_node = rk_dailink.cpu_of_node;
@@ -190,17 +191,36 @@ static int snd_rk_mc_probe(struct platform_device *pdev) 
	if (ret) {

		dev_err(&pdev->dev,

			"Soc parse card name failed %d\n", ret);

		return ret;

		goto put_cpu_of_node;

	}



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

	if (ret) {

		dev_err(&pdev->dev,

			"Soc register card failed %d\n", ret);

		return ret;

		goto put_cpu_of_node;

	}



	return ret;



put_cpu_of_node:

	of_node_put(rk_dailink.cpu_of_node);

	rk_dailink.cpu_of_node = NULL;

put_codec_of_node:

	of_node_put(rk_dailink.codec_of_node);

	rk_dailink.codec_of_node = NULL;



	return ret;

}



static int snd_rk_mc_remove(struct platform_device *pdev)

{

	of_node_put(rk_dailink.cpu_of_node);

	rk_dailink.cpu_of_node = NULL;

	of_node_put(rk_dailink.codec_of_node);

	rk_dailink.codec_of_node = NULL;



	return 0;

}



static const struct of_device_id rockchip_rt5645_of_match[] = {
@@ -212,6 +232,7 @@ MODULE_DEVICE_TABLE(of, rockchip_rt5645_of_match); 


static struct platform_driver snd_rk_mc_driver = {

	.probe = snd_rk_mc_probe,

	.remove = snd_rk_mc_remove,

	.driver = {

		.name = DRV_NAME,

		.pm = &snd_soc_pm_ops,