Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 07:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-2.6.38' into for-2.6.39

Browse Source
This commit is contained in:
Mark Brown 2011-02-22 10:38:13 -08:00
commit 4c090edfbb
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/wm8903.h
View File

@ -173,7 +173,7 @@ extern int wm8903_mic_detect(struct snd_soc_codec *codec,
#define WM8903_VMID_RES_50K 2 #define WM8903_VMID_RES_50K 2
#define WM8903_VMID_RES_250K 3 #define WM8903_VMID_RES_250K 3
#define WM8903_VMID_RES_5K 4 #define WM8903_VMID_RES_5K 6
/* /*
* R8 (0x08) - Analogue DAC 0 * R8 (0x08) - Analogue DAC 0

5
sound/soc/codecs/wm8994.c
View File

@ -3000,11 +3000,10 @@ static void wm8958_default_micdet(u16 status, void *data)
report |= SND_JACK_BTN_5; report |= SND_JACK_BTN_5;
done: 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_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 |
SND_JACK_BTN_3 | SND_JACK_BTN_4 | SND_JACK_BTN_5 | SND_JACK_BTN_3 | SND_JACK_BTN_4 | SND_JACK_BTN_5 |
SND_JACK_MICROPHONE | SND_JACK_VIDEOOUT, SND_JACK_MICROPHONE | SND_JACK_VIDEOOUT);
report);
} }
/** /**