diff options
| author |   Dinghao Liu <dinghao.liu@zju.edu.cn> | 2020-05-25 16:58:48 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-05-26 17:20:22 +0100 |
| commit | c553d290577093553098a56c954e516950c35c59 (patch) | |
| tree | 1e738d75813c06bd48c0ee08bdcad9c180719fd9 | |
| parent | ASoC: fix semicolon.cocci warnings (diff) | |
| download | linux-dev-c553d290577093553098a56c954e516950c35c59.tar.xz linux-dev-c553d290577093553098a56c954e516950c35c59.zip | |
ASoC: ti: Fix runtime PM imbalance in omap2_mcbsp_set_clks_src
When clk_set_parent() returns an error code, a pairing
runtime PM usage counter increment is needed to keep the
counter balanced.
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/20200525085848.4227-1-dinghao.liu@zju.edu.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/ti/omap-mcbsp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index 4e67769b795a..32e3ccdbb7a2 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -77,18 +77,15 @@ static int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id) pm_runtime_put_sync(mcbsp->dev); r = clk_set_parent(mcbsp->fclk, fck_src); - if (r) { + if (r) dev_err(mcbsp->dev, "CLKS: could not clk_set_parent() to %s\n", src); - clk_put(fck_src); - return r; - } pm_runtime_get_sync(mcbsp->dev); clk_put(fck_src); - return 0; + return r; } static irqreturn_t omap_mcbsp_irq_handler(int irq, void *data) |