Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d15f21d authored by Vaishali Thakkar's avatar Vaishali Thakkar Committed by Mark Brown
Browse files

ASoC: tegra: Revert part of "ASoC: tegra: Convert to managed resources" 



Revert the problematic part of commit 470805eb ("ASoC: tegra:
Convert to managed resources"). Before this commit, PM cleanup was
performed after the component was unregistered. But returning
directly will skip PM cleanup. So, to be on safe side it is better
to use snd_soc_register_component instead of
devm_snd_soc_register_component.

Signed-off-by: default avatarVaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 470805eb

sound/soc/tegra/tegra20_spdif.c

+6 −4
Original line number Diff line number Diff line
@@ -329,8 +329,7 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) 
			goto err_pm_disable;

	}



	ret = devm_snd_soc_register_component(&pdev->dev,

					      &tegra20_spdif_component,

	ret = snd_soc_register_component(&pdev->dev, &tegra20_spdif_component,

					 &tegra20_spdif_dai, 1);

	if (ret) {

		dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
@@ -341,11 +340,13 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) 
	ret = tegra_pcm_platform_register(&pdev->dev);

	if (ret) {

		dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);

		return ret;

		goto err_unregister_component;

	}



	return 0;



err_unregister_component:

	snd_soc_unregister_component(&pdev->dev);

err_suspend:

	if (!pm_runtime_status_suspended(&pdev->dev))

		tegra20_spdif_runtime_suspend(&pdev->dev);
@@ -364,6 +365,7 @@ static int tegra20_spdif_platform_remove(struct platform_device *pdev) 
		tegra20_spdif_runtime_suspend(&pdev->dev);



	tegra_pcm_platform_unregister(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);



	return 0;

}