diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-07-11 10:33:47 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-07-11 10:33:47 +0200 |
| commit | 21ce0b65272b85f122455818b0c69740945b451a (patch) | |
| tree | 9207d5a36a5496e3a3ae38abb160ed6cb577da4e /sound/pci/hda | |
| parent | 017f2a104c7fed53a9b2534f0795f1f5af87674f (diff) | |
| download | op-kernel-dev-21ce0b65272b85f122455818b0c69740945b451a.zip op-kernel-dev-21ce0b65272b85f122455818b0c69740945b451a.tar.gz | |
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 0da4f8f..be2e57b 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, 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; } |
