| Message ID | 20220315025415.2593762-1-zhangqilong3@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | cc5d8ac95663a5813c696008bc524b794d471215 |
| Headers | show |
| Series | [-next] ASoC: rockchip: Fix PM usage reference of rockchip_i2s_tdm_resume | expand |
On Dienstag, 15. März 2022 03:54:15 CET zhangqilong wrote: > pm_runtime_get_sync will increment pm usage counter > even it failed. Forgetting to putting operation will > result in reference leak here. We fix it by replacing > it with pm_runtime_resume_and_get to keep usage counter > balanced. > > Fixes:081068fd64140 ("ASoC: rockchip: add support for i2s-tdm controller") > Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> Hello, Reviewed-by: Nicolas Frattaroli <frattaroli.nicolas@gmail.com> Thank you for fixing this! Regards, Nicolas Frattaroli > --- > sound/soc/rockchip/rockchip_i2s_tdm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c > index 5f9cb5c4c7f0..d3b710406941 100644 > --- a/sound/soc/rockchip/rockchip_i2s_tdm.c > +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c > @@ -1738,7 +1738,7 @@ static int __maybe_unused rockchip_i2s_tdm_resume(struct device *dev) > struct rk_i2s_tdm_dev *i2s_tdm = dev_get_drvdata(dev); > int ret; > > - ret = pm_runtime_get_sync(dev); > + ret = pm_runtime_resume_and_get(dev); > if (ret < 0) > return ret; > ret = regcache_sync(i2s_tdm->regmap); >
On Tue, 15 Mar 2022 10:54:15 +0800, zhangqilong wrote: > pm_runtime_get_sync will increment pm usage counter > even it failed. Forgetting to putting operation will > result in reference leak here. We fix it by replacing > it with pm_runtime_resume_and_get to keep usage counter > balanced. > > Fixes:081068fd64140 ("ASoC: rockchip: add support for i2s-tdm controller") > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: rockchip: Fix PM usage reference of rockchip_i2s_tdm_resume commit: cc5d8ac95663a5813c696008bc524b794d471215 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c index 5f9cb5c4c7f0..d3b710406941 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.c +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -1738,7 +1738,7 @@ static int __maybe_unused rockchip_i2s_tdm_resume(struct device *dev) struct rk_i2s_tdm_dev *i2s_tdm = dev_get_drvdata(dev); int ret; - ret = pm_runtime_get_sync(dev); + ret = pm_runtime_resume_and_get(dev); if (ret < 0) return ret; ret = regcache_sync(i2s_tdm->regmap);
pm_runtime_get_sync will increment pm usage counter even it failed. Forgetting to putting operation will result in reference leak here. We fix it by replacing it with pm_runtime_resume_and_get to keep usage counter balanced. Fixes:081068fd64140 ("ASoC: rockchip: add support for i2s-tdm controller") Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> --- sound/soc/rockchip/rockchip_i2s_tdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)