summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorKuninori Morimoto2015-03-19 05:13:47 +0100
committerMark Brown2015-03-22 19:12:15 +0100
commit044930b4a69a6c0645b6199bec4f870e0b6e77f4 (patch)
treea83271df71a0920e0de0b9fad6f2cdbd3f0bbdf6 /sound/soc
parentASoC: rsnd: constify of_device_id array (diff)
downloadkernel-qcow2-linux-044930b4a69a6c0645b6199bec4f870e0b6e77f4.tar.gz
kernel-qcow2-linux-044930b4a69a6c0645b6199bec4f870e0b6e77f4.tar.xz
kernel-qcow2-linux-044930b4a69a6c0645b6199bec4f870e0b6e77f4.zip
ASoC: rsnd: no more SSI restart when unusual situation
It will be SSI interrupt endless loop f unusual situation happen. This patch adds restart limit for it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/sh/rcar/ssi.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index fea4aa53918a..060d3d205250 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -416,11 +416,14 @@ static irqreturn_t rsnd_ssi_interrupt(int irq, void *data)
/*
* restart SSI
*/
- rsnd_ssi_stop(mod, priv);
- rsnd_ssi_start(mod, priv);
-
dev_dbg(dev, "%s[%d] restart\n",
rsnd_mod_name(mod), rsnd_mod_id(mod));
+
+ rsnd_ssi_stop(mod, priv);
+ if (ssi->err < 1024)
+ rsnd_ssi_start(mod, priv);
+ else
+ dev_warn(dev, "no more SSI restart\n");
}
rsnd_ssi_record_error(ssi, status);