summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-07-15 22:43:07 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-07-15 22:43:07 +0900
commit47d90a03ebd44951060a6284316ecd0cb3aaf3e2 (patch)
tree26072b60b04fa1fccdf7ecbb4fa21d74e4ef85d5 /sound
parent58499906c8e9a87b4b65435effca733802c9b57d (diff)
parentb35e160a111aa9ae3fad6294e038be20d0da721b (diff)
downloadlinux-47d90a03ebd44951060a6284316ecd0cb3aaf3e2.tar.bz2
Merge branch 'for-3.0' into for-3.1
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8994.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 3acb1bda6c73..ee64be2d9942 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2788,7 +2788,7 @@ static void wm8958_default_micdet(u16 status, void *data)
report = SND_JACK_MICROPHONE;
/* Everything else is buttons; just assign slots */
- if (status & 0x1c0)
+ if (status & 0x1c)
report |= SND_JACK_BTN_0;
done: