]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: Acknowledge WM8996 interrupts before acting on them
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 20 Jul 2011 12:49:58 +0000 (13:49 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 8 Aug 2011 05:30:59 +0000 (14:30 +0900)
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>
sound/soc/codecs/wm8996.c

index 00f9ace85bf70ab6c3c4ca40c54442b1c0afa3a2..ab8e9d1aaff0a0194138cb08a06a806ea8e0559e 100644 (file)
@@ -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)