xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions 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-13 19:51:04 +00:00
parent 905f6952c5 3017358a75
commit f98dedcefd
4 changed files with 196 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1620,7 +1620,7 @@ int wm8903_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
WM8903_MICDET_EINT | WM8903_MICSHRT_EINT,
irq_mask);
if (det && shrt) {
if (det || shrt) {
/* Enable mic detection, this may not have been set through
* platform data (eg, if the defaults are OK). */
snd_soc_update_bits(codec, WM8903_WRITE_SEQUENCER_0,