ASoC: nau8825: set clear_irq when imm IRQ happened
authorJohn Hsu <KCHSU0@nuvoton.com>
Thu, 30 Nov 2017 02:13:17 +0000 (10:13 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 30 Nov 2017 12:28:18 +0000 (12:28 +0000)
Although the crosstalk is disabled, it is better to set clear_irq
properly when the impedance measurement interrupt happens.
It can avoid that the driver clears other IRQs by accident
if the active_irq has another IRQ events.

Signed-off-by: John Hsu <KCHSU0@nuvoton.com>
Reviewed-by: Wu-Cheng Li <wuchengli@chromium.org>
Tested-by: Wu-Cheng Li <wuchengli@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/nau8825.c

index d3c1a02f1e15d8792f7692ac2f7558fa136d6313..603cd72c2a254f78fce5bb27674d6bc12158a516 100644 (file)
@@ -1733,10 +1733,9 @@ static irqreturn_t nau8825_interrupt(int irq, void *data)
                        nau8825->xtalk_event_mask = event_mask;
                }
        } else if (active_irq & NAU8825_IMPEDANCE_MEAS_IRQ) {
-               if (nau8825->xtalk_enable) {
+               if (nau8825->xtalk_enable)
                        schedule_work(&nau8825->xtalk_work);
-                       clear_irq = NAU8825_IMPEDANCE_MEAS_IRQ;
-               }
+               clear_irq = NAU8825_IMPEDANCE_MEAS_IRQ;
        } else if ((active_irq & NAU8825_JACK_INSERTION_IRQ_MASK) ==
                NAU8825_JACK_INSERTION_DETECTED) {
                /* One more step to check GPIO status directly. Thus, the