diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-15 09:43:07 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-15 09:43:07 -0400 |
| commit | 47d90a03ebd44951060a6284316ecd0cb3aaf3e2 (patch) | |
| tree | 26072b60b04fa1fccdf7ecbb4fa21d74e4ef85d5 /sound/soc/codecs/wm8994.c | |
| parent | 58499906c8e9a87b4b65435effca733802c9b57d (diff) | |
| parent | b35e160a111aa9ae3fad6294e038be20d0da721b (diff) | |
Merge branch 'for-3.0' into for-3.1
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 2 |
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) | |||
| 2788 | report = SND_JACK_MICROPHONE; | 2788 | report = SND_JACK_MICROPHONE; |
| 2789 | 2789 | ||
| 2790 | /* Everything else is buttons; just assign slots */ | 2790 | /* Everything else is buttons; just assign slots */ |
| 2791 | if (status & 0x1c0) | 2791 | if (status & 0x1c) |
| 2792 | report |= SND_JACK_BTN_0; | 2792 | report |= SND_JACK_BTN_0; |
| 2793 | 2793 | ||
| 2794 | done: | 2794 | done: |