| Message ID | 20200613205158.27296-1-wu000273@umn.edu (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f141a422159a199f4c8dedb7e0df55b3b2cf16cd |
| Headers | show |
| Series | ASoC: rockchip: Fix a reference count leak. | expand |
Am Samstag, 13. Juni 2020, 22:51:58 CEST schrieb wu000273@umn.edu: > From: Qiushi Wu <wu000273@umn.edu> > > Calling pm_runtime_get_sync increments the counter even in case of > failure, causing incorrect ref count if pm_runtime_put is not called in > error handling paths. Call pm_runtime_put if pm_runtime_get_sync fails. > > Fixes: fc05a5b22253 ("ASoC: rockchip: add support for pdm controller") > Signed-off-by: Qiushi Wu <wu000273@umn.edu> somewhat unintuitive, but I checked __pm_runtime_resume for it, so Reviewed-by: Heiko Stuebner <heiko@sntech.de> > --- > sound/soc/rockchip/rockchip_pdm.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c > index 7cd42fcfcf38..1707414cfa92 100644 > --- a/sound/soc/rockchip/rockchip_pdm.c > +++ b/sound/soc/rockchip/rockchip_pdm.c > @@ -590,8 +590,10 @@ static int rockchip_pdm_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(pdm->regmap); > >
On Sat, 13 Jun 2020 15:51:58 -0500, wu000273@umn.edu wrote: > Calling pm_runtime_get_sync increments the counter even in case of > failure, causing incorrect ref count if pm_runtime_put is not called in > error handling paths. Call pm_runtime_put if pm_runtime_get_sync fails. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: rockchip: Fix a reference count leak. commit: f141a422159a199f4c8dedb7e0df55b3b2cf16cd 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_pdm.c b/sound/soc/rockchip/rockchip_pdm.c index 7cd42fcfcf38..1707414cfa92 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -590,8 +590,10 @@ static int rockchip_pdm_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(pdm->regmap);