[PATCH] ASoC: rockchip: i2s_tdm: fix runtime pm imbalance on error

Zhen Ni posted 1 patch 4 years, 3 months ago
sound/soc/rockchip/rockchip_i2s_tdm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
[PATCH] ASoC: rockchip: i2s_tdm: fix runtime pm imbalance on error
Posted by Zhen Ni 4 years, 3 months ago
pm_runtime_get_sync() increments the runtime PM usage counter even the
call returns an error code. Thus a pairing decrement is needed on the
error handling path to keep the counter balanced.

Signed-off-by: Zhen Ni <nizhen@uniontech.com>
---
 sound/soc/rockchip/rockchip_i2s_tdm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c
index 5f9cb5c4c7f0..4691a76b499d 100644
--- a/sound/soc/rockchip/rockchip_i2s_tdm.c
+++ b/sound/soc/rockchip/rockchip_i2s_tdm.c
@@ -1739,8 +1739,10 @@ static int __maybe_unused rockchip_i2s_tdm_resume(struct device *dev)
 	int ret;
 
 	ret = pm_runtime_get_sync(dev);
-	if (ret < 0)
+	if (ret < 0) {
+		pm_runtime_put(dev);
 		return ret;
+	}
 	ret = regcache_sync(i2s_tdm->regmap);
 	pm_runtime_put(dev);
 
-- 
2.20.1
Re: [PATCH] ASoC: rockchip: i2s_tdm: fix runtime pm imbalance on error
Posted by Takashi Iwai 4 years, 3 months ago
On Wed, 02 Mar 2022 11:00:19 +0100,
Zhen Ni wrote:
> 
> pm_runtime_get_sync() increments the runtime PM usage counter even the
> call returns an error code. Thus a pairing decrement is needed on the
> error handling path to keep the counter balanced.
> 
> Signed-off-by: Zhen Ni <nizhen@uniontech.com>

Better to use a new function pm_runtime_resume_and_get().


thanks,

Takashi

> ---
>  sound/soc/rockchip/rockchip_i2s_tdm.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c
> index 5f9cb5c4c7f0..4691a76b499d 100644
> --- a/sound/soc/rockchip/rockchip_i2s_tdm.c
> +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c
> @@ -1739,8 +1739,10 @@ static int __maybe_unused rockchip_i2s_tdm_resume(struct device *dev)
>  	int ret;
>  
>  	ret = pm_runtime_get_sync(dev);
> -	if (ret < 0)
> +	if (ret < 0) {
> +		pm_runtime_put(dev);
>  		return ret;
> +	}
>  	ret = regcache_sync(i2s_tdm->regmap);
>  	pm_runtime_put(dev);
>  
> -- 
> 2.20.1
> 
> 
>