diff options
author | Ed Blake <ed.blake@sondrel.com> | 2017-10-02 12:00:33 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-10-04 12:39:59 +0200 |
commit | c70458890ff15d858bd347fa9f563818bcd6e457 (patch) | |
tree | 8a0c83bddacea61a6fe12ca75860fdcc377479af /sound | |
parent | ASoC: img-i2s-out: Rename suspend / resume funcs (diff) | |
download | linux-c70458890ff15d858bd347fa9f563818bcd6e457.tar.xz linux-c70458890ff15d858bd347fa9f563818bcd6e457.zip |
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.
Signed-off-by: Ed Blake <ed.blake@sondrel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/img/img-parallel-out.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/img/img-parallel-out.c b/sound/soc/img/img-parallel-out.c index 23b0f0f6ec9c..2fc8a6372206 100644 --- a/sound/soc/img/img-parallel-out.c +++ b/sound/soc/img/img-parallel-out.c @@ -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; } |