Merge branch 'for-2.6.38' into for-2.6.39

4c090edf · Mark Brown · 4baafdd7 · cea2bc50 · 4c090edf · 4c090edf
Commit 4c090edf authored Feb 22, 2011 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

sound/soc/codecs/wm8903.h sound/soc/codecs/wm8903.h +1 -1

sound/soc/codecs/wm8994.c sound/soc/codecs/wm8994.c +2 -3

No files found.
--- 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

--- 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);
 }

 /**