summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-07-20 13:49:58 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-08 14:30:59 +0900
commit844970916c8e50f630ea1a6ac82f09c42b12660a (patch)
tree9b6ce6c046bec61d355aed0b8e482e9ee4ab39e0 /sound
parenta9ba615134ad32254fae84f16e1751854755135c (diff)
downloadlinux-3.10-844970916c8e50f630ea1a6ac82f09c42b12660a.tar.gz
linux-3.10-844970916c8e50f630ea1a6ac82f09c42b12660a.tar.bz2
linux-3.10-844970916c8e50f630ea1a6ac82f09c42b12660a.zip
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 <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8996.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index 00f9ace85bf..ab8e9d1aaff 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)