diff options
| author |   Mark Brown <broonie@kernel.org> | 2022-09-27 19:58:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-09-27 19:58:57 +0100 |
| commit | 16b51447b20c24d79b13a4477fdef93dbba123e4 (patch) | |
| tree | dcb3aa2ea642d0e7bc5fd9e16a026ff126280a34 /sound/soc | |
| parent | ASoC: stm: Fix PM disable depth imbalance in stm32_i2s_probe (diff) | |
| parent | ASoC: stm32: spdifrx: Fix PM disable depth imbalance in stm32_spdifrx_probe (diff) | |
| download | linux-dev-16b51447b20c24d79b13a4477fdef93dbba123e4.tar.xz linux-dev-16b51447b20c24d79b13a4477fdef93dbba123e4.zip | |
Fix PM disable depth imbalance in stm32 probe
Merge series from Zhang Qilong <zhangqilong3@huawei.com>:
The pm_runtime_enable will increase power disable depth. Thus
a pairing decrement is needed on the error handling path to
keep it balanced. We fix it by moving pm_runtime_enable to the
endding of probe.
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/stm/stm32_adfsdm.c | 8 | ||||
| -rw-r--r-- | sound/soc/stm/stm32_spdifrx.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c index 04f2912e1418..643fc8a17018 100644 --- a/sound/soc/stm/stm32_adfsdm.c +++ b/sound/soc/stm/stm32_adfsdm.c @@ -335,8 +335,6 @@ static int stm32_adfsdm_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, priv); - pm_runtime_enable(&pdev->dev); - ret = devm_snd_soc_register_component(&pdev->dev, &stm32_adfsdm_dai_component, &priv->dai_drv, 1); @@ -366,9 +364,13 @@ static int stm32_adfsdm_probe(struct platform_device *pdev) #endif ret = snd_soc_add_component(component, NULL, 0); - if (ret < 0) + if (ret < 0) { dev_err(&pdev->dev, "%s: Failed to register PCM platform\n", __func__); + return ret; + } + + pm_runtime_enable(&pdev->dev); return ret; } diff --git a/sound/soc/stm/stm32_spdifrx.c b/sound/soc/stm/stm32_spdifrx.c index 0f7146756717..d399c906bb92 100644 --- a/sound/soc/stm/stm32_spdifrx.c +++ b/sound/soc/stm/stm32_spdifrx.c @@ -1002,8 +1002,6 @@ static int stm32_spdifrx_probe(struct platform_device *pdev) udelay(2); reset_control_deassert(rst); - pm_runtime_enable(&pdev->dev); - pcm_config = &stm32_spdifrx_pcm_config; ret = snd_dmaengine_pcm_register(&pdev->dev, pcm_config, 0); if (ret) @@ -1036,6 +1034,8 @@ static int stm32_spdifrx_probe(struct platform_device *pdev) FIELD_GET(SPDIFRX_VERR_MIN_MASK, ver)); } + pm_runtime_enable(&pdev->dev); + return ret; error: |