diff options
| author |   Zhang Qilong <zhangqilong3@huawei.com> | 2022-09-27 22:26:40 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2022-09-27 18:16:46 +0100 |
| commit | 93618e5e05a3ce4aa6750268c5025bdb4cb7dc6e (patch) | |
| tree | dd40515a834e656ad4aab5c86433a75a580f337d /sound/soc | |
| parent | ASoC: cs42l42: Fallback to headphones for type detect (diff) | |
| download | linux-dev-93618e5e05a3ce4aa6750268c5025bdb4cb7dc6e.tar.xz linux-dev-93618e5e05a3ce4aa6750268c5025bdb4cb7dc6e.zip | |
ASoC: stm: Fix PM disable depth imbalance in stm32_i2s_probe
The pm_runtime_enable will increase power disable depth. Thus
a pairing decrement is needed on the error handling path to
keep it balanced according to context. We fix it by moving
pm_runtime_enable to the endding of stm32_i2s_probe.
Fixes:32a956a1fadf ("ASoC: stm32: i2s: add pm_runtime support")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Reviewed-by: Olivier Moysan <olivier.moysan@foss.st.com>
Link: https://lore.kernel.org/r/20220927142640.64647-1-zhangqilong3@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/stm/stm32_i2s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c index 6aafe793eec4..ce7f6942308f 100644 --- a/sound/soc/stm/stm32_i2s.c +++ b/sound/soc/stm/stm32_i2s.c @@ -1136,8 +1136,6 @@ static int stm32_i2s_probe(struct platform_device *pdev) return dev_err_probe(&pdev->dev, PTR_ERR(i2s->regmap), "Regmap init error\n"); - pm_runtime_enable(&pdev->dev); - ret = snd_dmaengine_pcm_register(&pdev->dev, &stm32_i2s_pcm_config, 0); if (ret) return dev_err_probe(&pdev->dev, ret, "PCM DMA register error\n"); @@ -1180,6 +1178,8 @@ static int stm32_i2s_probe(struct platform_device *pdev) FIELD_GET(I2S_VERR_MIN_MASK, val)); } + pm_runtime_enable(&pdev->dev); + return ret; error: |