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 | |
| parent | 4baafdd76bafc51699a924d2bc1317f50b4ea75f (diff) | |
| parent | cea2bc50a3dd88e43be2e926a9ae31ab7816bf2d (diff) | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8903.h | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8903.h b/sound/soc/codecs/wm8903.h index 9ef394ae0dd3..db949311c0f2 100644 --- a/sound/soc/codecs/wm8903.h +++ b/sound/soc/codecs/wm8903.h @@ -173,7 +173,7 @@ extern int wm8903_mic_detect(struct snd_soc_codec *codec, #define WM8903_VMID_RES_50K 2 #define WM8903_VMID_RES_250K 3 -#define WM8903_VMID_RES_5K 4 +#define WM8903_VMID_RES_5K 6 /* * R8 (0x08) - Analogue DAC 0 diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index c0adbf8098ec..b23e91027d64 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); } /** |