diff options
| author | Takashi Iwai | 2011-04-28 17:57:46 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2011-04-28 17:57:46 +0200 |
| commit | 1daf5f46c62bc69922e1ca8ccebbbff04f48e1f1 (patch) | |
| tree | f4e4d8631635424431cebb477724cc7e8a8a3065 /sound | |
| parent | ALSA: hda - Add support for Line-Out automute to Realtek auto-parser (diff) | |
| download | kernel-qcow2-linux-1daf5f46c62bc69922e1ca8ccebbbff04f48e1f1.tar.gz kernel-qcow2-linux-1daf5f46c62bc69922e1ca8ccebbbff04f48e1f1.tar.xz kernel-qcow2-linux-1daf5f46c62bc69922e1ca8ccebbbff04f48e1f1.zip | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 15 |
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; |