kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Takashi Iwai 2011-04-28 17:57:46 +02:00
parent 1a1455de10
commit 1daf5f46c6
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sound/pci/hda/patch_realtek.c
View file

@ -1517,16 +1517,19 @@ static void alc_init_auto_hp(struct hda_codec *codec)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
struct auto_pin_cfg *cfg = &spec->autocfg; struct auto_pin_cfg *cfg = &spec->autocfg;
int present = 0;
int i; int i;
if (!cfg->hp_pins[0]) { if (cfg->hp_pins[0])
if (cfg->line_out_type != AUTO_PIN_HP_OUT) present++;
return; 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->speaker_pins[0]) {
if (cfg->line_out_type != AUTO_PIN_SPEAKER_OUT)
return;
memcpy(cfg->speaker_pins, cfg->line_out_pins, memcpy(cfg->speaker_pins, cfg->line_out_pins,
sizeof(cfg->speaker_pins)); sizeof(cfg->speaker_pins));
cfg->speaker_outs = cfg->line_outs; cfg->speaker_outs = cfg->line_outs;