From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 7 Dec 2010 15:32:38 +0000 (+0000)
Subject: ASoC: Correct WM8962 interrupt mask register read
X-Git-Tag: v2.6.37-rc6~25^2^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2a7b1a00206895cfa444fd83477dca67a88a9d25;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index e8092745a20..1304ca91a11 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;