aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-02-13 11:19:35 -0500
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:10 -0400
commitd260cdf65657382c4cde366a1c7d4ddce669a427 (patch)
tree79203c51707b26aae05e9baedaf94c38bb1e4dee /sound/pci
parentc8cd1281171602033861d0888273e0512f9b165c (diff)
[ALSA] hda-codec - Fix breakage of resume in auto-config of realtek codecs
The last patch for fixing the auto-config pin setting breaks the resume due to a wrong use of snd_hda_codec_amp_stereo(). The code in the init hook shouldn't touch the amp cache. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_realtek.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 6c605813fc6e..355d88d07ea2 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3489,7 +3489,8 @@ static void alc_set_pin_output(struct hda_codec *codec, hda_nid_t nid,
3489 snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 3489 snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
3490 pin_type); 3490 pin_type);
3491 /* unmute pin */ 3491 /* unmute pin */
3492 snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0, 0xff, 0x00); 3492 snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
3493 AMP_OUT_UNMUTE);
3493} 3494}
3494 3495
3495static void alc880_auto_set_output_and_unmute(struct hda_codec *codec, 3496static void alc880_auto_set_output_and_unmute(struct hda_codec *codec,