Unverified Commit 65bd91dd authored by Dinghao Liu's avatar Dinghao Liu Committed by Mark Brown
Browse files

ASoC: img-i2s-out: Fix runtime PM imbalance on error 



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: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Link: https://lore.kernel.org/r/20200529012230.5863-1-dinghao.liu@zju.edu.cn


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4a043450

sound/soc/img/img-i2s-out.c

+6 −2
Original line number Diff line number Diff line
@@ -347,8 +347,10 @@ static int img_i2s_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
	chan_control_mask = IMG_I2S_OUT_CHAN_CTL_CLKT_MASK;



	ret = pm_runtime_get_sync(i2s->dev);

	if (ret < 0)

	if (ret < 0) {

		pm_runtime_put_noidle(i2s->dev);

		return ret;

	}



	img_i2s_out_disable(i2s);
@@ -488,8 +490,10 @@ static int img_i2s_out_probe(struct platform_device *pdev) 
			goto err_pm_disable;

	}

	ret = pm_runtime_get_sync(&pdev->dev);

	if (ret < 0)

	if (ret < 0) {

		pm_runtime_put_noidle(&pdev->dev);

		goto err_suspend;

	}



	reg = IMG_I2S_OUT_CTL_FRM_SIZE_MASK;

	img_i2s_out_writel(i2s, reg, IMG_I2S_OUT_CTL);