ALSA: hda - Via Fix speaker-mute checks in VIA driver

When the line-jack is plugged/unplugged, the driver must check also
the headphone jack state in addition to the line-out jack.  Currently
it checks only the line-out state and ignores the headphone.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2011-07-11 10:33:47 +02:00
parent 017f2a104c
commit 21ce0b6527

View file

@ -1606,12 +1606,10 @@ static void via_unsol_event(struct hda_codec *codec,
res &= ~VIA_JACK_EVENT;
if (res == VIA_HP_EVENT)
if (res == VIA_HP_EVENT || res == VIA_LINE_EVENT)
via_hp_automute(codec);
else if (res == VIA_GPIO_EVENT)
via_gpio_control(codec);
else if (res == VIA_LINE_EVENT)
via_line_automute(codec, false);
}
#ifdef SND_HDA_NEEDS_RESUME
@ -2535,7 +2533,6 @@ static int via_init(struct hda_codec *codec)
via_auto_init_unsol_event(codec);
via_hp_automute(codec);
via_line_automute(codec, false);
return 0;
}