Skip to content

Commit

Permalink
[ALSA] hda-codec - Fix headphone auto-toggle on sigmatel codec
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Jaroslav Kysela <[email protected]>
  • Loading branch information
tiwai authored and Jaroslav Kysela committed Sep 23, 2006
1 parent 5c79b1f commit eb995a8
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions sound/pci/hda/patch_sigmatel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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++)
Expand All @@ -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);
}
}

Expand Down

0 comments on commit eb995a8

Please sign in to comment.