Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c090edf authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.38' into for-2.6.39

parents 4baafdd7 cea2bc50

sound/soc/codecs/wm8903.h

+1 −1
Original line number Diff line number Diff line
@@ -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

sound/soc/codecs/wm8994.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

}



/**