summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-09-21 14:28:21 +0200
committerJaroslav Kysela <perex@suse.cz>2006-09-23 10:48:12 +0200
commiteb995a8c82dba4a8e027c99ac5001fbc287a115c (patch)
treeee0bc14b9fd86361661db92f42aaa974d883fc80 /sound
parent5c79b1f887f8edcd399baa164b66a1c08566c994 (diff)
downloadlinux-3.10-eb995a8c82dba4a8e027c99ac5001fbc287a115c.tar.gz
linux-3.10-eb995a8c82dba4a8e027c99ac5001fbc287a115c.tar.bz2
linux-3.10-eb995a8c82dba4a8e027c99ac5001fbc287a115c.zip
[ALSA] hda-codec - Fix headphone auto-toggle on sigmatel codec
Fix/optimize the headphone auto-toggle function on sigmatel codecs. The headphone pins are kept as output. When headhpones are unplugged, you cannot hear anyway ;) Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_sigmatel.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 92f48a72585..731b7b97ee7 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -1432,12 +1432,9 @@ static int stac92xx_init(struct hda_codec *codec)
for (i = 0; i < cfg->hp_outs; i++)
enable_pin_detect(codec, cfg->hp_pins[i],
STAC_HP_EVENT);
+ stac92xx_auto_init_hp_out(codec);
/* fake event to set up pins */
codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26);
- /* enable the headphones by default.
- * If/when unsol_event detection works, this will be ignored
- */
- stac92xx_auto_init_hp_out(codec);
} else {
stac92xx_auto_init_multi_out(codec);
stac92xx_auto_init_hp_out(codec);
@@ -1539,9 +1536,6 @@ static void stac92xx_hp_detect(struct hda_codec *codec, unsigned int res)
for (i = 0; i < cfg->speaker_outs; i++)
stac92xx_reset_pinctl(codec, cfg->speaker_pins[i],
AC_PINCTL_OUT_EN);
- for (i = 0; i < cfg->hp_outs; i++)
- stac92xx_set_pinctl(codec, cfg->hp_pins[i],
- AC_PINCTL_OUT_EN);
} else {
/* enable lineouts, disable hp */
for (i = 0; i < cfg->line_outs; i++)
@@ -1550,9 +1544,6 @@ static void stac92xx_hp_detect(struct hda_codec *codec, unsigned int res)
for (i = 0; i < cfg->speaker_outs; i++)
stac92xx_set_pinctl(codec, cfg->speaker_pins[i],
AC_PINCTL_OUT_EN);
- for (i = 0; i < cfg->hp_outs; i++)
- stac92xx_reset_pinctl(codec, cfg->hp_pins[i],
- AC_PINCTL_OUT_EN);
}
}