| From foo@baz Thu Dec 21 09:02:40 CET 2017 |
| From: Ed Blake <ed.blake@sondrel.com> |
| Date: Mon, 2 Oct 2017 11:00:33 +0100 |
| Subject: ASoC: img-parallel-out: Add pm_runtime_get/put to set_fmt callback |
| |
| From: Ed Blake <ed.blake@sondrel.com> |
| |
| |
| [ Upstream commit c70458890ff15d858bd347fa9f563818bcd6e457 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| sound/soc/img/img-parallel-out.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/sound/soc/img/img-parallel-out.c |
| +++ b/sound/soc/img/img-parallel-out.c |
| @@ -166,9 +166,11 @@ static int img_prl_out_set_fmt(struct sn |
| 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; |
| } |
