ALSA: hda/realtek - Don't detect LO jack when identical with HP
authorTakashi Iwai <tiwai@suse.de>
Mon, 26 Sep 2011 13:19:55 +0000 (15:19 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 26 Sep 2011 13:24:57 +0000 (15:24 +0200)
The spec->autocfg.line_out_pins[] may contain the same pins as hp_pins[]
depending on the configuration.  When they are identical, detecting the
line_jack_present flag screws up the auto-mute because alc_line_automute()
is called unconditionally at initialization while it won't be triggered
by unsol events, thus the old line_jack_present flag is kept for the
whole run.

For fixing this buggy behavior, the driver needs to check whether the
line-outs are really individual, and skip if same as headphone jacks.

Reference: https://bugzilla.novell.com/show_bug.cgi?id=716104

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_realtek.c

index 91a538173c977e75fcabcdb8767b24d8dd6207a9..7a73621a89090e7a7b6bd482bbfd54dafb610722 100644 (file)
@@ -578,6 +578,10 @@ static void alc_line_automute(struct hda_codec *codec)
 {
        struct alc_spec *spec = codec->spec;
 
+       /* check LO jack only when it's different from HP */
+       if (spec->autocfg.line_out_pins[0] == spec->autocfg.hp_pins[0])
+               return;
+
        spec->line_jack_present =
                detect_jacks(codec, ARRAY_SIZE(spec->autocfg.line_out_pins),
                             spec->autocfg.line_out_pins);