diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-11-18 03:36:55 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-11-18 03:43:10 -0500 |
commit | 2c885878c1b29293f04cfb4a5bd285c969148a8b (patch) | |
tree | 40384f53eceec2e7d78992fc9ae3a7d970352733 /sound/pci/hda/patch_sigmatel.c | |
parent | e4973e1e5a42072ce88736ba0e39e4b8fc6c3c44 (diff) |
ALSA: hda - Use init callback in stac92xx_resume()
Call the init callback and remove duplicated codes in stac92xx_resume().
This also fixes the missing initialization such as digital I/O pins.
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 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index b6cf821434c8..bf9a40ee789e 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -4142,17 +4142,13 @@ static int stac92xx_resume(struct hda_codec *codec) | |||
4142 | struct sigmatel_spec *spec = codec->spec; | 4142 | struct sigmatel_spec *spec = codec->spec; |
4143 | 4143 | ||
4144 | stac92xx_set_config_regs(codec); | 4144 | stac92xx_set_config_regs(codec); |
4145 | snd_hda_sequence_write(codec, spec->init); | 4145 | stac92xx_init(codec); |
4146 | stac_gpio_set(codec, spec->gpio_mask, | ||
4147 | spec->gpio_dir, spec->gpio_data); | ||
4148 | snd_hda_codec_resume_amp(codec); | 4146 | snd_hda_codec_resume_amp(codec); |
4149 | snd_hda_codec_resume_cache(codec); | 4147 | snd_hda_codec_resume_cache(codec); |
4150 | /* power down inactive DACs */ | 4148 | /* fake event to set up pins again to override cached values */ |
4151 | if (spec->dac_list) | ||
4152 | stac92xx_power_down(codec); | ||
4153 | /* invoke unsolicited event to reset the HP state */ | ||
4154 | if (spec->hp_detect) | 4149 | if (spec->hp_detect) |
4155 | codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26); | 4150 | codec->patch_ops.unsol_event(codec, |
4151 | (STAC_HP_EVENT | spec->autocfg.hp_pins[0]) << 26); | ||
4156 | return 0; | 4152 | return 0; |
4157 | } | 4153 | } |
4158 | #endif | 4154 | #endif |