| Message ID | 20220926134155.121427-1-zhangqilong3@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,-next] ASoC: stm: Fix PM disable depth imbalance in stm32_i2s_probe | expand |
Hi Zhang, Thanks.You can add my: Reviewed-by: Olivier Moysan <olivier.moysan@foss.st.com> BRs On 9/26/22 15:41, Zhang Qilong wrote: > 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> > --- > v2: > - Move pm_runtime_enable to the endding of stm32_i2s_probe > and correct fixes commit. > --- > sound/soc/stm/stm32_i2s.c | 4 ++-- > 1 file 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:
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:
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> --- v2: - Move pm_runtime_enable to the endding of stm32_i2s_probe and correct fixes commit. --- sound/soc/stm/stm32_i2s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)