diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-22 10:38:13 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-22 10:38:13 -0800 |
| commit | 4c090edfbbe3f8e63ec9fb7abaab17e0191646a1 (patch) | |
| tree | f90c28b485d7b43c4162e834c6f1b5b7bd6ae294 /sound/soc/codecs/wm8994.c | |
| parent | 4baafdd76bafc51699a924d2bc1317f50b4ea75f (diff) | |
| parent | cea2bc50a3dd88e43be2e926a9ae31ab7816bf2d (diff) | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index c0adbf8098e..b23e91027d6 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3000,11 +3000,10 @@ static void wm8958_default_micdet(u16 status, void *data) report |= SND_JACK_BTN_5; done: - snd_soc_jack_report(wm8994->micdet[0].jack, + snd_soc_jack_report(wm8994->micdet[0].jack, report, SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3 | SND_JACK_BTN_4 | SND_JACK_BTN_5 | - SND_JACK_MICROPHONE | SND_JACK_VIDEOOUT, - report); + SND_JACK_MICROPHONE | SND_JACK_VIDEOOUT); } /** |