diff --git a/[refs] b/[refs] index 67bfd95dcd44..a2814640a908 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 447ee6a7cbbfb5ae7ab8f9b8b058b4a04fe398bf +refs/heads/master: 2557f7427d4bd1fc00166556e3047c5f3ed91958 diff --git a/trunk/sound/pci/hda/patch_conexant.c b/trunk/sound/pci/hda/patch_conexant.c index 35bebe59908d..eecc154d0b63 100644 --- a/trunk/sound/pci/hda/patch_conexant.c +++ b/trunk/sound/pci/hda/patch_conexant.c @@ -3420,13 +3420,13 @@ static void cx_auto_check_auto_mic(struct hda_codec *codec) if (is_ext_mic(codec, cfg->inputs[0].pin) && is_int_mic(codec, cfg->inputs[1].pin)) { spec->auto_mic = 1; - spec->auto_mic_ext = 1; + spec->auto_mic_ext = 0; return; } - if (is_int_mic(codec, cfg->inputs[1].pin) && - is_ext_mic(codec, cfg->inputs[0].pin)) { + if (is_int_mic(codec, cfg->inputs[0].pin) && + is_ext_mic(codec, cfg->inputs[1].pin)) { spec->auto_mic = 1; - spec->auto_mic_ext = 0; + spec->auto_mic_ext = 1; return; } }