summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto2014-04-23 07:59:12 +0200
committerMark Brown2014-04-23 13:17:12 +0200
commit836b31fe1a9791d84ed95783ed42ebd5719f7918 (patch)
tree685e83cf76537870ac7a30369cbc44477e4029df
parentASoC: rsnd: fix clock prepare/unprepare (diff)
downloadkernel-qcow2-linux-836b31fe1a9791d84ed95783ed42ebd5719f7918.tar.gz
kernel-qcow2-linux-836b31fe1a9791d84ed95783ed42ebd5719f7918.tar.xz
kernel-qcow2-linux-836b31fe1a9791d84ed95783ed42ebd5719f7918.zip
ASoC: rsnd: call rsnd_dai_pointer_update() from outside of lock
rsnd_soc_dai_trigger() will be called after rsnd_dai_pointer_update() function which is using rsnd_lock(). Thus, it should be called from outside of rsnd_lock(). Kernel will be hangup without this patch. Special thanks to Kataoka-san Reported-by: Ryo Kataoka <ryo.kataoka.wt@renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/sh/rcar/core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 215b668166be..89424470a1f3 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -197,13 +197,12 @@ static void rsnd_dma_complete(void *data)
* rsnd_dai_pointer_update() will be called twice,
* ant it will breaks io->byte_pos
*/
-
- rsnd_dai_pointer_update(io, io->byte_per_period);
-
if (dma->submit_loop)
rsnd_dma_continue(dma);
rsnd_unlock(priv, flags);
+
+ rsnd_dai_pointer_update(io, io->byte_per_period);
}
static void __rsnd_dma_start(struct rsnd_dma *dma)