Commit 16b51447 authored by Mark Brown's avatar Mark Brown

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.
parents 93618e5e 0325cc0a
...@@ -335,8 +335,6 @@ static int stm32_adfsdm_probe(struct platform_device *pdev) ...@@ -335,8 +335,6 @@ static int stm32_adfsdm_probe(struct platform_device *pdev)
dev_set_drvdata(&pdev->dev, priv); dev_set_drvdata(&pdev->dev, priv);
pm_runtime_enable(&pdev->dev);
ret = devm_snd_soc_register_component(&pdev->dev, ret = devm_snd_soc_register_component(&pdev->dev,
&stm32_adfsdm_dai_component, &stm32_adfsdm_dai_component,
&priv->dai_drv, 1); &priv->dai_drv, 1);
...@@ -366,9 +364,13 @@ static int stm32_adfsdm_probe(struct platform_device *pdev) ...@@ -366,9 +364,13 @@ static int stm32_adfsdm_probe(struct platform_device *pdev)
#endif #endif
ret = snd_soc_add_component(component, NULL, 0); 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", dev_err(&pdev->dev, "%s: Failed to register PCM platform\n",
__func__); __func__);
return ret;
}
pm_runtime_enable(&pdev->dev);
return ret; return ret;
} }
......
...@@ -1002,8 +1002,6 @@ static int stm32_spdifrx_probe(struct platform_device *pdev) ...@@ -1002,8 +1002,6 @@ static int stm32_spdifrx_probe(struct platform_device *pdev)
udelay(2); udelay(2);
reset_control_deassert(rst); reset_control_deassert(rst);
pm_runtime_enable(&pdev->dev);
pcm_config = &stm32_spdifrx_pcm_config; pcm_config = &stm32_spdifrx_pcm_config;
ret = snd_dmaengine_pcm_register(&pdev->dev, pcm_config, 0); ret = snd_dmaengine_pcm_register(&pdev->dev, pcm_config, 0);
if (ret) if (ret)
...@@ -1036,6 +1034,8 @@ static int stm32_spdifrx_probe(struct platform_device *pdev) ...@@ -1036,6 +1034,8 @@ static int stm32_spdifrx_probe(struct platform_device *pdev)
FIELD_GET(SPDIFRX_VERR_MIN_MASK, ver)); FIELD_GET(SPDIFRX_VERR_MIN_MASK, ver));
} }
pm_runtime_enable(&pdev->dev);
return ret; return ret;
error: error:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment