diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-20 08:49:58 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 01:30:59 -0400 |
commit | 844970916c8e50f630ea1a6ac82f09c42b12660a (patch) | |
tree | 9b6ce6c046bec61d355aed0b8e482e9ee4ab39e0 /sound/soc | |
parent | a9ba615134ad32254fae84f16e1751854755135c (diff) |
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/soc')
-rw-r--r-- | sound/soc/codecs/wm8996.c | 9 |
1 files changed, 4 insertions, 5 deletions
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) | |||
2404 | } | 2404 | } |
2405 | irq_val &= ~snd_soc_read(codec, WM8996_INTERRUPT_STATUS_2_MASK); | 2405 | irq_val &= ~snd_soc_read(codec, WM8996_INTERRUPT_STATUS_2_MASK); |
2406 | 2406 | ||
2407 | snd_soc_write(codec, WM8996_INTERRUPT_STATUS_2, irq_val); | ||
2408 | |||
2407 | if (irq_val & (WM8996_DCS_DONE_01_EINT | WM8996_DCS_DONE_23_EINT)) { | 2409 | if (irq_val & (WM8996_DCS_DONE_01_EINT | WM8996_DCS_DONE_23_EINT)) { |
2408 | dev_dbg(codec->dev, "DC servo IRQ\n"); | 2410 | dev_dbg(codec->dev, "DC servo IRQ\n"); |
2409 | complete(&wm8996->dcs_done); | 2411 | complete(&wm8996->dcs_done); |
@@ -2420,13 +2422,10 @@ static irqreturn_t wm8996_irq(int irq, void *data) | |||
2420 | if (irq_val & WM8996_MICD_EINT) | 2422 | if (irq_val & WM8996_MICD_EINT) |
2421 | wm8996_micd(codec); | 2423 | wm8996_micd(codec); |
2422 | 2424 | ||
2423 | if (irq_val) { | 2425 | if (irq_val) |
2424 | snd_soc_write(codec, WM8996_INTERRUPT_STATUS_2, irq_val); | ||
2425 | |||
2426 | return IRQ_HANDLED; | 2426 | return IRQ_HANDLED; |
2427 | } else { | 2427 | else |
2428 | return IRQ_NONE; | 2428 | return IRQ_NONE; |
2429 | } | ||
2430 | } | 2429 | } |
2431 | 2430 | ||
2432 | static irqreturn_t wm8996_edge_irq(int irq, void *data) | 2431 | static irqreturn_t wm8996_edge_irq(int irq, void *data) |