summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-02-18 11:16:04 +0300
committerMark Brown <broonie@kernel.org>2016-02-19 18:53:02 +0300
commit5bf5d8fc7f5a8a1e75413939e4bdb00ebc2d5610 (patch)
treeb9a22629d0bf986a81e562c024841b21c68d3479
parent26d34b11af6a344da6191beca2e2883f65d2597a (diff)
downloadlinux-5bf5d8fc7f5a8a1e75413939e4bdb00ebc2d5610.tar.xz
ASoC: rsnd: fixup forever loop bug on SSI
commit b5b442abd9 ("ASoC: rsnd: add .irq callback") added .irq support, and it cares both parent SSI and normal SSI. But it should care only normal SSI. Otherwise SSI might be forever loop if SSI is used as both parent SSI and normal SSI (= 2 users), and if under/over run error happen. Because irq disable do nothing in such case. This patch solve this issue. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/sh/rcar/ssi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index c5c4510afb2d..90c3f58821db 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -149,13 +149,12 @@ static int rsnd_ssi_irq(struct rsnd_mod *mod,
struct rsnd_priv *priv,
int enable)
{
- struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
u32 val = 0;
if (rsnd_is_gen1(priv))
return 0;
- if (ssi->usrcnt != 1)
+ if (rsnd_ssi_is_parent(mod, io))
return 0;
if (enable)