projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6b46432)
ASoC: Correct WM8962 interrupt mask register read
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Dec 2010 15:32:38 +0000 (15:32 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Dec 2010 15:49:42 +0000 (15:49 +0000)
Fix mismerge from the out of tree BSP where this support was developed.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8962.c patch | blob | blame | history

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index e8092745a207674caaf4351d815870e7367b4003..1304ca91a11c708c567f69c45052c95f1f7be17e 100644 (file)
--- 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;