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: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/rockchip/rockchip_rt5645.c b/sound/soc/rockchip/rockchip_rt5645.c
index 4db4fd56db358f4549f434a3e3712ed450f5776c..881c324988086b68eaf8d6426f9188c1934d343e 100644 (file)
--- a/sound/soc/rockchip/rockchip_rt5645.c
+++ b/sound/soc/rockchip/rockchip_rt5645.c
@@ -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,