openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Dinghao Liu 2020-05-25 16:58:48 +08:00 committed by Mark Brown
parent edc475bee0
commit c553d29057
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/ti/omap-mcbsp.c
View File

@ -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); pm_runtime_put_sync(mcbsp->dev);
r = clk_set_parent(mcbsp->fclk, fck_src); 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", dev_err(mcbsp->dev, "CLKS: could not clk_set_parent() to %s\n",
src); src);
clk_put(fck_src);
return r;
}
pm_runtime_get_sync(mcbsp->dev); pm_runtime_get_sync(mcbsp->dev);
clk_put(fck_src); clk_put(fck_src);
return 0; return r;
} }
static irqreturn_t omap_mcbsp_irq_handler(int irq, void *data) static irqreturn_t omap_mcbsp_irq_handler(int irq, void *data)