Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84497091 authored by Mark Brown's avatar Mark Brown
Browse files

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a9ba6151

sound/soc/codecs/wm8996.c

+4 −5
Original line number Diff line number Diff line
@@ -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,14 +2422,11 @@ 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)

{