diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-08-04 07:40:54 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-08-04 07:40:54 -0400 |
commit | 16ffe32c773dab387cfc5e6bdf181367ff944376 (patch) | |
tree | 468527b07ff2c340b9e4c1636dfb94bcf421232a /sound/pci/hda/patch_sigmatel.c | |
parent | 15cfa2b3db8b64d4e66d36fb88d21bae9ea3dfba (diff) |
ALSA: hda - Fix line-out jack handling with STAC/IDT codec
When the line-out jack is plugged/unplugged, the driver needs to check
the headphone plug, not only the line-out jack itself. Otherwise the
headphone or the speaker may be wrongly muted/unmuted.
As a result, both STAC_HP_EVENT and STAC_LO_EVENT need to call the
same function, stac92xx_hp_detect().
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 9961fe197694..edeeb5686964 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -4782,10 +4782,8 @@ static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res) | |||
4782 | 4782 | ||
4783 | switch (event->type) { | 4783 | switch (event->type) { |
4784 | case STAC_HP_EVENT: | 4784 | case STAC_HP_EVENT: |
4785 | stac92xx_hp_detect(codec); | ||
4786 | break; | ||
4787 | case STAC_LO_EVENT: | 4785 | case STAC_LO_EVENT: |
4788 | stac92xx_line_out_detect(codec, 0); | 4786 | stac92xx_hp_detect(codec); |
4789 | break; | 4787 | break; |
4790 | case STAC_MIC_EVENT: | 4788 | case STAC_MIC_EVENT: |
4791 | stac92xx_mic_detect(codec); | 4789 | stac92xx_mic_detect(codec); |