diff options
| author | Dmitry Osipenko <digetx@gmail.com> | 2021-03-14 18:44:51 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-03-18 16:49:37 +0300 |
| commit | ca6e960ed6b10ba9236da8b3614574bb4524c65e (patch) | |
| tree | 26dc77eb2f65f26cce5fb5442c42f2174af223c6 | |
| parent | e33fdd9bee12be35d080bfd4acc9d1e3a0d04001 (diff) | |
| download | linux-ca6e960ed6b10ba9236da8b3614574bb4524c65e.tar.xz | |
ASoC: tegra20: i2s: Correct driver removal order
Tegra20 I2S driver has a wrong driver removal order, which should be
opposite to the registration order, but it's not. In particular the
runtime PM is disabled in a wrong order. Fix the order.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20210314154459.15375-10-digetx@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/tegra/tegra20_i2s.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c index 267517446d27..0f2bdc2e8598 100644 --- a/sound/soc/tegra/tegra20_i2s.c +++ b/sound/soc/tegra/tegra20_i2s.c @@ -440,13 +440,13 @@ static int tegra20_i2s_platform_remove(struct platform_device *pdev) { struct tegra20_i2s *i2s = dev_get_drvdata(&pdev->dev); + tegra_pcm_platform_unregister(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); + pm_runtime_disable(&pdev->dev); if (!pm_runtime_status_suspended(&pdev->dev)) tegra20_i2s_runtime_suspend(&pdev->dev); - tegra_pcm_platform_unregister(&pdev->dev); - snd_soc_unregister_component(&pdev->dev); - clk_put(i2s->clk_i2s); return 0; |