ASoC: tegra_sgtl5000: fix device_node refcounting
Similar to the following: commit4321723648
("ASoC: tegra_alc5632: fix device_node refcounting") commit7c5dfd5496
("ASoC: tegra: fix device_node refcounting") Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
7e95aac96b
Коммит
a85227da2d
|
@ -149,14 +149,14 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev)
|
|||
dev_err(&pdev->dev,
|
||||
"Property 'nvidia,i2s-controller' missing/invalid\n");
|
||||
ret = -EINVAL;
|
||||
goto err;
|
||||
goto err_put_codec_of_node;
|
||||
}
|
||||
|
||||
tegra_sgtl5000_dai.platform_of_node = tegra_sgtl5000_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) {
|
||||
|
@ -169,6 +169,13 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev)
|
|||
|
||||
err_fini_utils:
|
||||
tegra_asoc_utils_fini(&machine->util_data);
|
||||
err_put_cpu_of_node:
|
||||
of_node_put(tegra_sgtl5000_dai.cpu_of_node);
|
||||
tegra_sgtl5000_dai.cpu_of_node = NULL;
|
||||
tegra_sgtl5000_dai.platform_of_node = NULL;
|
||||
err_put_codec_of_node:
|
||||
of_node_put(tegra_sgtl5000_dai.codec_of_node);
|
||||
tegra_sgtl5000_dai.codec_of_node = NULL;
|
||||
err:
|
||||
return ret;
|
||||
}
|
||||
|
@ -183,6 +190,12 @@ static int tegra_sgtl5000_driver_remove(struct platform_device *pdev)
|
|||
|
||||
tegra_asoc_utils_fini(&machine->util_data);
|
||||
|
||||
of_node_put(tegra_sgtl5000_dai.cpu_of_node);
|
||||
tegra_sgtl5000_dai.cpu_of_node = NULL;
|
||||
tegra_sgtl5000_dai.platform_of_node = NULL;
|
||||
of_node_put(tegra_sgtl5000_dai.codec_of_node);
|
||||
tegra_sgtl5000_dai.codec_of_node = NULL;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче