diff options
| author | Mark Brown <broonie@kernel.org> | 2020-06-01 13:01:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-06-01 13:01:15 +0100 |
| commit | 358c7c61fd04d324f83d7968daf8dd9a6ff86a9a (patch) | |
| tree | 23c64d19f8d321a501f9e3567befc527c0fe1d55 /sound/soc/img/img-i2s-out.c | |
| parent | a72ff08faf3d6b2a1c21c9b815bf02af44cc70ab (diff) | |
| parent | a6b675a89e51a1cdad0481b809b7840d3f86e4b5 (diff) | |
| download | linux-358c7c61fd04d324f83d7968daf8dd9a6ff86a9a.tar.gz linux-358c7c61fd04d324f83d7968daf8dd9a6ff86a9a.tar.bz2 linux-358c7c61fd04d324f83d7968daf8dd9a6ff86a9a.zip | |
Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus
Diffstat (limited to 'sound/soc/img/img-i2s-out.c')
| -rw-r--r-- | sound/soc/img/img-i2s-out.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/img/img-i2s-out.c b/sound/soc/img/img-i2s-out.c index db052ec17d5d..b56a18e7f3ac 100644 --- a/sound/soc/img/img-i2s-out.c +++ b/sound/soc/img/img-i2s-out.c @@ -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); |