projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b543c35
)
ASoC: fsl_esai: Disable exception interrupt before scheduling tasklet
author
Shengjiu Wang
<shengjiu.wang@nxp.com>
Mon, 27 Apr 2020 06:23:21 +0000
(14:23 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 24 Jun 2020 15:50:09 +0000
(17:50 +0200)
[ Upstream commit
1fecbb71fe0e46b886f84e3b6decca6643c3af6d
]
Disable exception interrupt before scheduling tasklet, otherwise if
the tasklet isn't handled immediately, there will be endless xrun
interrupt.
Fixes:
7ccafa2b3879
("ASoC: fsl_esai: recover the channel swap after xrun")
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Link:
https://lore.kernel.org/r/a8f2ad955aac9e52587beedc1133b3efbe746895.1587968824.git.shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/fsl/fsl_esai.c
patch
|
blob
|
history
diff --git
a/sound/soc/fsl/fsl_esai.c
b/sound/soc/fsl/fsl_esai.c
index
c7a49d0
..
84290be
100644
(file)
--- a/
sound/soc/fsl/fsl_esai.c
+++ b/
sound/soc/fsl/fsl_esai.c
@@
-87,6
+87,10
@@
static irqreturn_t esai_isr(int irq, void *devid)
if ((saisr & (ESAI_SAISR_TUE | ESAI_SAISR_ROE)) &&
esai_priv->reset_at_xrun) {
dev_dbg(&pdev->dev, "reset module for xrun\n");
+ regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR,
+ ESAI_xCR_xEIE_MASK, 0);
+ regmap_update_bits(esai_priv->regmap, REG_ESAI_RCR,
+ ESAI_xCR_xEIE_MASK, 0);
tasklet_schedule(&esai_priv->task);
}