Skip to content

Commit

Permalink
ASoC: Acknowledge WM8996 interrupts before acting on them
Browse files Browse the repository at this point in the history
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 <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Aug 8, 2011
1 parent a9ba615 commit 8449709
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions sound/soc/codecs/wm8996.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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)
Expand Down

0 comments on commit 8449709

Please sign in to comment.