summaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-06-01 13:01:13 +0100
committerMark Brown <broonie@kernel.org>2020-06-01 13:01:13 +0100
commita72ff08faf3d6b2a1c21c9b815bf02af44cc70ab (patch)
tree5d9292f82ef7a236930febee51373565e1842398 /sound/soc/fsl
parent9cb1fd0efd195590b828b9b865421ad345a4a145 (diff)
parentf4aa5e214eeaf7f1c7f157526a5aa29784cb6a1f (diff)
downloadlinux-a72ff08faf3d6b2a1c21c9b815bf02af44cc70ab.tar.gz
linux-a72ff08faf3d6b2a1c21c9b815bf02af44cc70ab.tar.bz2
linux-a72ff08faf3d6b2a1c21c9b815bf02af44cc70ab.zip
Merge remote-tracking branch 'asoc/for-5.7' into asoc-linus
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r--sound/soc/fsl/fsl_esai.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index c7a49d03463a..84290be778f0 100644
--- 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);
}