ALSA: hda - More line-out auto-mute support for Realtek

Not only supporting the line-out automute as additional feature
to the existing headphone automute, now the headphone jack can
mute the line-out alone even without the speaker outs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 9 insertions, 6 deletions

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 9e2594d6db96..3e41d5637764 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1517,16 +1517,19 @@ static void alc_init_auto_hp(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         struct auto_pin_cfg *cfg = &spec->autocfg;
+        int present = 0;
         int i;
 
-        if (!cfg->hp_pins[0]) {
-                if (cfg->line_out_type != AUTO_PIN_HP_OUT)
-                        return;
-        }
+        if (cfg->hp_pins[0])
+                present++;
+        if (cfg->line_out_pins[0])
+                present++;
+        if (cfg->speaker_pins[0])
+                present++;
+        if (present < 2) /* need two different output types */
+                return;
 
         if (!cfg->speaker_pins[0]) {
-                if (cfg->line_out_type != AUTO_PIN_SPEAKER_OUT)
-                        return;
                 memcpy(cfg->speaker_pins, cfg->line_out_pins,
                        sizeof(cfg->speaker_pins));
                 cfg->speaker_outs = cfg->line_outs;