ASoC: img-parallel-out: Add pm_runtime_get/put to set_fmt callback
PATCH 1/1 ASoC: img-parallel-out: Add pm_runtime_get/put to set_fmt callback
Add pm_runtime_get_sync and pm_runtime_put calls to set_fmt callback function. This fixes a bus error during boot when CONFIG_SUSPEND is defined when this function gets called while the device is runtime disabled and device registers are accessed while the clock is disabled.
--- sound/soc/img/img-parallel-out.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/img/img-parallel-out.c +2 -0
@@ -164,9 +164,11 @@ static int img_prl_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)return -EINVAL ; } +pm_runtime_get_sync (prl->dev); reg =img_prl_out_readl (prl,IMG_PRL_OUT_CTL ); reg = (reg & ~IMG_PRL_OUT_CTL_EDGE_MASK ) | control_set;img_prl_out_writel (prl, reg,IMG_PRL_OUT_CTL ); +pm_runtime_put (prl->dev);return 0 ; }
Signature · 1 line
1.9.1
Mark Brown
maintainersound/soc/img/img-parallel-out.c static int img_prl_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) · line 167
Quoted 1 line · Ed Blake
sound/soc/img/img-parallel-out.c +1
-0+pm_runtime_get_sync (prl->dev);
I'll apply this since the driver already has runtime PM and it makes things better but please in a followup patch add error handling.
Mark Brown
maintainerApplied "ASoC: img-parallel-out: Add pm_runtime_get/put to set_fmt callback" to the asoc tree
In reply to Ed BlakeThe patch
ASoC: img-parallel-out: Add pm_runtime_get/put to set_fmt callback
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
c70458890ff15d858bd347fa9f563818bcd6e457Mon Sep 17 00:00:00 2001
From: Ed Blake <[email protected]>
Date: Mon, 2 Oct 2017 11:00:33 +0100
Subject: [PATCH] ASoC: img-parallel-out: Add pm_runtime_get/put to set_fmt
callback
Add pm_runtime_get_sync and pm_runtime_put calls to set_fmt callback function. This fixes a bus error during boot when CONFIG_SUSPEND is defined when this function gets called while the device is runtime disabled and device registers are accessed while the clock is disabled.
--- sound/soc/img/img-parallel-out.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/img/img-parallel-out.c +2 -0
@@ -164,9 +164,11 @@ static int img_prl_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)return -EINVAL ; } +pm_runtime_get_sync (prl->dev); reg =img_prl_out_readl (prl,IMG_PRL_OUT_CTL ); reg = (reg & ~IMG_PRL_OUT_CTL_EDGE_MASK ) | control_set;img_prl_out_writel (prl, reg,IMG_PRL_OUT_CTL ); +pm_runtime_put (prl->dev);return 0 ; }
Signature · 1 line
2.14.1