summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8962.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-08 13:54:33 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-08 13:54:33 +0000
commit5a4cfce73b7b48bdbb4e816124e5fcf84bc58e59 (patch)
tree0d84d5096b34bfb794b52dc59271c184e9d3e4ea /sound/soc/codecs/wm8962.c
parent6b3ed78535c5af8c1d25ed7eaaea7557698843a1 (diff)
parent2a7b1a00206895cfa444fd83477dca67a88a9d25 (diff)
Merge branch 'for-2.6.37' into for-2.6.38
Conflicts: sound/soc/soc-core.c Axel's fix on two different branches.
Diffstat (limited to 'sound/soc/codecs/wm8962.c')
-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 cf4b2722648a..f0c9d2691842 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;