Commit 84497091 authored by Mark Brown's avatar Mark Brown

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a9ba6151
...@@ -2404,6 +2404,8 @@ static irqreturn_t wm8996_irq(int irq, void *data) ...@@ -2404,6 +2404,8 @@ static irqreturn_t wm8996_irq(int irq, void *data)
} }
irq_val &= ~snd_soc_read(codec, WM8996_INTERRUPT_STATUS_2_MASK); 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)) { if (irq_val & (WM8996_DCS_DONE_01_EINT | WM8996_DCS_DONE_23_EINT)) {
dev_dbg(codec->dev, "DC servo IRQ\n"); dev_dbg(codec->dev, "DC servo IRQ\n");
complete(&wm8996->dcs_done); complete(&wm8996->dcs_done);
...@@ -2420,13 +2422,10 @@ static irqreturn_t wm8996_irq(int irq, void *data) ...@@ -2420,13 +2422,10 @@ static irqreturn_t wm8996_irq(int irq, void *data)
if (irq_val & WM8996_MICD_EINT) if (irq_val & WM8996_MICD_EINT)
wm8996_micd(codec); wm8996_micd(codec);
if (irq_val) { if (irq_val)
snd_soc_write(codec, WM8996_INTERRUPT_STATUS_2, irq_val);
return IRQ_HANDLED; return IRQ_HANDLED;
} else { else
return IRQ_NONE; return IRQ_NONE;
}
} }
static irqreturn_t wm8996_edge_irq(int irq, void *data) static irqreturn_t wm8996_edge_irq(int irq, void *data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment