Skip to content

Commit

Permalink
ASoC: tegra: fix device_node refcounting
Browse files Browse the repository at this point in the history
tegra_rt5677_probe() gets a couple of device nodes with of_parse_phandle(),
but there is no release of them.

The patch adds the release to tegra_rt5677_remove() and
to error handling paths in the probe.

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

Signed-off-by: Alexey Khoroshilov <[email protected]>
Reviewed-by: Nicholas Mc Guire <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
khoroshilov authored and broonie committed Jun 18, 2018
1 parent a451952 commit 7c5dfd5
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions sound/soc/tegra/tegra_rt5677.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,13 +264,13 @@ static int tegra_rt5677_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_rt5677_dai.platform_of_node = tegra_rt5677_dai.cpu_of_node;

ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);
if (ret)
goto err;
goto err_put_cpu_of_node;

ret = snd_soc_register_card(card);
if (ret) {
Expand All @@ -283,6 +283,13 @@ static int tegra_rt5677_probe(struct platform_device *pdev)

err_fini_utils:
tegra_asoc_utils_fini(&machine->util_data);
err_put_cpu_of_node:
of_node_put(tegra_rt5677_dai.cpu_of_node);
tegra_rt5677_dai.cpu_of_node = NULL;
tegra_rt5677_dai.platform_of_node = NULL;
err_put_codec_of_node:
of_node_put(tegra_rt5677_dai.codec_of_node);
tegra_rt5677_dai.codec_of_node = NULL;
err:
return ret;
}
Expand All @@ -296,6 +303,12 @@ static int tegra_rt5677_remove(struct platform_device *pdev)

tegra_asoc_utils_fini(&machine->util_data);

tegra_rt5677_dai.platform_of_node = NULL;
of_node_put(tegra_rt5677_dai.codec_of_node);
tegra_rt5677_dai.codec_of_node = NULL;
of_node_put(tegra_rt5677_dai.cpu_of_node);
tegra_rt5677_dai.cpu_of_node = NULL;

return 0;
}

Expand Down

0 comments on commit 7c5dfd5

Please sign in to comment.