diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-11-08 17:44:06 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-11-08 17:44:06 +0100 |
| commit | 53b5fdb617859a68ab0f4961e524982297bcd7c7 (patch) | |
| tree | c810e2b648f1cdeb324f6eabc7fd5a0fc9c9ac74 /sound/soc/ti/omap-mcbsp.c | |
| parent | f0d9da19d7de9e845e7a93a901c4b9658df6b492 (diff) | |
| parent | 45f2f28bd498fb697d07a38775d55f0f50fee5ca (diff) | |
Merge tag 'asoc-fix-v6.7-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.7
A collection of fixes that have come in during the merge window, the
majority of this is driver specific with one core fix for handling of
DAPM clock widgets when a name prefix is specified for the card - the
name should not be applied to the clock name we request from the clock
API.
Diffstat (limited to 'sound/soc/ti/omap-mcbsp.c')
| -rw-r--r-- | sound/soc/ti/omap-mcbsp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index 7643a54592f5..2110ffe5281c 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -73,14 +73,16 @@ static int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id) return 0; } - pm_runtime_put_sync(mcbsp->dev); + if (mcbsp->active) + pm_runtime_put_sync(mcbsp->dev); r = clk_set_parent(mcbsp->fclk, fck_src); if (r) dev_err(mcbsp->dev, "CLKS: could not clk_set_parent() to %s\n", src); - pm_runtime_get_sync(mcbsp->dev); + if (mcbsp->active) + pm_runtime_get_sync(mcbsp->dev); clk_put(fck_src); |