diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-07-11 04:33:47 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-07-11 04:33:47 -0400 |
commit | 21ce0b65272b85f122455818b0c69740945b451a (patch) | |
tree | 9207d5a36a5496e3a3ae38abb160ed6cb577da4e /sound/pci/hda | |
parent | 017f2a104c7fed53a9b2534f0795f1f5af87674f (diff) |
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>
Diffstat (limited to 'sound/pci/hda')
-rw-r--r-- | sound/pci/hda/patch_via.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 0da4f8ff5420..be2e57b44507 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c | |||
@@ -1606,12 +1606,10 @@ static void via_unsol_event(struct hda_codec *codec, | |||
1606 | 1606 | ||
1607 | res &= ~VIA_JACK_EVENT; | 1607 | res &= ~VIA_JACK_EVENT; |
1608 | 1608 | ||
1609 | if (res == VIA_HP_EVENT) | 1609 | if (res == VIA_HP_EVENT || res == VIA_LINE_EVENT) |
1610 | via_hp_automute(codec); | 1610 | via_hp_automute(codec); |
1611 | else if (res == VIA_GPIO_EVENT) | 1611 | else if (res == VIA_GPIO_EVENT) |
1612 | via_gpio_control(codec); | 1612 | via_gpio_control(codec); |
1613 | else if (res == VIA_LINE_EVENT) | ||
1614 | via_line_automute(codec, false); | ||
1615 | } | 1613 | } |
1616 | 1614 | ||
1617 | #ifdef SND_HDA_NEEDS_RESUME | 1615 | #ifdef SND_HDA_NEEDS_RESUME |
@@ -2535,7 +2533,6 @@ static int via_init(struct hda_codec *codec) | |||
2535 | via_auto_init_unsol_event(codec); | 2533 | via_auto_init_unsol_event(codec); |
2536 | 2534 | ||
2537 | via_hp_automute(codec); | 2535 | via_hp_automute(codec); |
2538 | via_line_automute(codec, false); | ||
2539 | 2536 | ||
2540 | return 0; | 2537 | return 0; |
2541 | } | 2538 | } |