summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorEd Blake <ed.blake@sondrel.com>2017-10-02 11:00:33 +0100
committerMark Brown <broonie@kernel.org>2017-10-04 11:39:59 +0100
commitc70458890ff15d858bd347fa9f563818bcd6e457 (patch)
tree8a0c83bddacea61a6fe12ca75860fdcc377479af /sound/soc
parent6f9dfab7fc5fdd51ed67da370fc83f3b7dbf08da (diff)
downloadlinux-c70458890ff15d858bd347fa9f563818bcd6e457.tar.gz
linux-c70458890ff15d858bd347fa9f563818bcd6e457.tar.bz2
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/soc')
-rw-r--r--sound/soc/img/img-parallel-out.c2
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;
}