summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-21 11:47:14 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-22 12:42:01 +0100
commite6ef58700a8afba46f2aa98a0de12c35e4b1f295 (patch)
treec41c70eff49550a2c73ca2a5ed9e304b813c7a3b /sound/soc/codecs
parent6f88a4e5785fbf4db9a2c7e16670e1f19e6566d2 (diff)
downloadlinux-e6ef58700a8afba46f2aa98a0de12c35e4b1f295.tar.bz2
ASoC: Report IRQ_NONE when we don't see an interrupt from WM8962
This should never happen with level triggered IRQs. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm8962.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 75e784053603..add07fff4495 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3570,6 +3570,9 @@ static irqreturn_t wm8962_irq(int irq, void *data)
active = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2);
active &= ~mask;
+ if (!active)
+ return IRQ_NONE;
+
/* Acknowledge the interrupts */
snd_soc_write(codec, WM8962_INTERRUPT_STATUS_2, active);