renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 14:43:58 +08:00
Code

[ALSA] hda-codec - Fix wrong pin-setup at resume of STAC codecs

Browse Source 
The resume procedure for STAC codecs overrides the cached values and
results in the wrong (reset) PIN state.  The patch gets rid of the
overriding part and simplifies the resume.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Takashi Iwai 2007-09-03 09:36:36 +02:00 committed by Jaroslav Kysela
parent 3a7788b751
commit dc81bed127
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/pci/hda/patch_sigmatel.c
View File

@ -2061,7 +2061,7 @@ static void enable_pin_detect(struct hda_codec *codec, hda_nid_t nid,
unsigned int event) unsigned int event)
{ {
if (get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP) if (get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP)
snd_hda_codec_write(codec, nid, 0, snd_hda_codec_write_cache(codec, nid, 0,
AC_VERB_SET_UNSOLICITED_ENABLE, AC_VERB_SET_UNSOLICITED_ENABLE,
(AC_USRSP_EN | event)); (AC_USRSP_EN | event));
} }
@ -2236,10 +2236,19 @@ static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res)
#ifdef SND_HDA_NEEDS_RESUME #ifdef SND_HDA_NEEDS_RESUME
static int stac92xx_resume(struct hda_codec *codec) static int stac92xx_resume(struct hda_codec *codec)
{ {
struct sigmatel_spec *spec = codec->spec;
stac92xx_set_config_regs(codec); stac92xx_set_config_regs(codec);
stac92xx_init(codec); snd_hda_sequence_write(codec, spec->init);
if (spec->gpio_mute) {
stac922x_gpio_mute(codec, 0, 0);
stac922x_gpio_mute(codec, 1, 0);
}
snd_hda_codec_resume_amp(codec); snd_hda_codec_resume_amp(codec);
snd_hda_codec_resume_cache(codec); snd_hda_codec_resume_cache(codec);
/* invoke unsolicited event to reset the HP state */
if (spec->hp_detect)
codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26);
return 0; return 0;
} }
#endif #endif