| From 70d213c60d5e9d3ecadafbaf209b5155fdbed820 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Wed, 23 Apr 2014 14:59:12 +0900 |
| Subject: 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> |
| (cherry picked from commit 836b31fe1a9791d84ed95783ed42ebd5719f7918) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/core.c | 5 ++--- |
| 1 file 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) |
| -- |
| 2.1.2 |
| |
