diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2015-06-15 06:21:15 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-16 12:34:01 +0100 |
| commit | 75defee0f1b3fcd91d8a304d6444635a459b8249 (patch) | |
| tree | dd5d78d7c54bdeacbc3e6e5cc1e17fe7c770ff95 /sound/soc/sh/rcar/rsnd.h | |
| parent | 12927a8f80264256e6cb2d3241fe9d6f4ad7face (diff) | |
| download | op-kernel-dev-75defee0f1b3fcd91d8a304d6444635a459b8249.zip op-kernel-dev-75defee0f1b3fcd91d8a304d6444635a459b8249.tar.gz | |
ASoC: rsnd: don't call snd_pcm_period_elapsed() under spin lock
'a9e1ac1a9e4585b5("ASoC: rsnd: spin lock for interrupt handler")'
added spin lock under interrupt handler to solve HW restart issue.
OTOH, current rsnd driver calls snd_pcm_period_elapsed() from
rsnd_dai_pointer_update(). but, it will be called under spin lock
if SSI was PIO mode.
If it was called under spin lock, it will call
snd_pcm_update_state() -> snd_pcm_drain_done().
Then, it calls rsnd_soc_dai_trigger() and will be dead-lock.
This patch doesn't call rsnd_dai_pointer_update() under spin lock
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sh/rcar/rsnd.h')
| -rw-r--r-- | sound/soc/sh/rcar/rsnd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 03ff071..e37234e 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -355,7 +355,8 @@ struct rsnd_dai { struct rsnd_dai *rsnd_rdai_get(struct rsnd_priv *priv, int id); -void rsnd_dai_pointer_update(struct rsnd_dai_stream *io, int cnt); +bool rsnd_dai_pointer_update(struct rsnd_dai_stream *io, int cnt); +void rsnd_dai_period_elapsed(struct rsnd_dai_stream *io); int rsnd_dai_pointer_offset(struct rsnd_dai_stream *io, int additional); /* |
