summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-07 15:32:38 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-07 15:49:42 +0000
commit2a7b1a00206895cfa444fd83477dca67a88a9d25 (patch)
tree957833960f0d41b643e3391a45a51db64ee317d4
parent6b464321d276e448d478c99202c19d83f2bd25f4 (diff)
downloadop-kernel-dev-2a7b1a00206895cfa444fd83477dca67a88a9d25.zip
op-kernel-dev-2a7b1a00206895cfa444fd83477dca67a88a9d25.tar.gz
ASoC: Correct WM8962 interrupt mask register read
Fix mismerge from the out of tree BSP where this support was developed. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/wm8962.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index e809274..1304ca9 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3339,7 +3339,7 @@ static irqreturn_t wm8962_irq(int irq, void *data)
int mask;
int active;
- mask = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2);
+ mask = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2_MASK);
active = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2);
active &= ~mask;
OpenPOWER on IntegriCloud