From 844970916c8e50f630ea1a6ac82f09c42b12660a Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 20 Jul 2011 13:49:58 +0100 Subject: ASoC: Acknowledge WM8996 interrupts before acting on them This closes the small race between a status being read in response to an interrupt and clearing the interrupt, meaning that if the status changes between those periods we might not get a reassertion of the interrupt. Signed-off-by: Mark Brown --- sound/soc/codecs/wm8996.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'sound') diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 00f9ace85bf7..ab8e9d1aaff0 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -2404,6 +2404,8 @@ static irqreturn_t wm8996_irq(int irq, void *data) } irq_val &= ~snd_soc_read(codec, WM8996_INTERRUPT_STATUS_2_MASK); + snd_soc_write(codec, WM8996_INTERRUPT_STATUS_2, irq_val); + if (irq_val & (WM8996_DCS_DONE_01_EINT | WM8996_DCS_DONE_23_EINT)) { dev_dbg(codec->dev, "DC servo IRQ\n"); complete(&wm8996->dcs_done); @@ -2420,13 +2422,10 @@ static irqreturn_t wm8996_irq(int irq, void *data) if (irq_val & WM8996_MICD_EINT) wm8996_micd(codec); - if (irq_val) { - snd_soc_write(codec, WM8996_INTERRUPT_STATUS_2, irq_val); - + if (irq_val) return IRQ_HANDLED; - } else { + else return IRQ_NONE; - } } static irqreturn_t wm8996_edge_irq(int irq, void *data) -- cgit v1.2.3