2.6.37-stable review patch. If anyone has any objections, please let us know.
------------------ From: Stephen Warren <[email protected]> commit 3088e3b4963d26d6f6f54987f595b974ed6d48d8 upstream. The mic detection HW should be enabled when either mic or short detection is required, not when only both are required. Signed-off-by: Stephen Warren <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- sound/soc/codecs/wm8903.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -1479,7 +1479,7 @@ int wm8903_mic_detect(struct snd_soc_cod 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, _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
