summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-08-04 13:40:54 +0200
committerTakashi Iwai <tiwai@suse.de>2009-08-04 13:40:54 +0200
commit16ffe32c773dab387cfc5e6bdf181367ff944376 (patch)
tree468527b07ff2c340b9e4c1636dfb94bcf421232a /sound/pci
parent15cfa2b3db8b64d4e66d36fb88d21bae9ea3dfba (diff)
downloadop-kernel-dev-16ffe32c773dab387cfc5e6bdf181367ff944376.zip
op-kernel-dev-16ffe32c773dab387cfc5e6bdf181367ff944376.tar.gz
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')
-rw-r--r--sound/pci/hda/patch_sigmatel.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 9961fe1..edeeb56 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)
switch (event->type) {
case STAC_HP_EVENT:
- stac92xx_hp_detect(codec);
- break;
case STAC_LO_EVENT:
- stac92xx_line_out_detect(codec, 0);
+ stac92xx_hp_detect(codec);
break;
case STAC_MIC_EVENT:
stac92xx_mic_detect(codec);
OpenPOWER on IntegriCloud