aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-05-17 11:17:43 -0400
committerJaroslav Kysela <perex@suse.cz>2006-06-22 15:33:46 -0400
commit474167d646cb2147b9fcd7bacf5cdf8177ed43c4 (patch)
tree8b2c6b202b6f419d6e4c9db6beedf679f47b467e /sound
parent6581f4e74d8541dd7d579f64e94822622cbb1654 (diff)
[ALSA] hda-codec - Fix init verbs for ALC260 hp model
Use the basic init verbs for ALC260 instead of hp init verbs since hp init verbs seem incomplete and not working on some machines. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 0fc2f77dce2c..ceb103b93b08 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3106,6 +3106,7 @@ static struct hda_verb alc260_init_verbs[] = {
3106 { } 3106 { }
3107}; 3107};
3108 3108
3109#if 0 /* should be identical with alc260_init_verbs? */
3109static struct hda_verb alc260_hp_init_verbs[] = { 3110static struct hda_verb alc260_hp_init_verbs[] = {
3110 /* Headphone and output */ 3111 /* Headphone and output */
3111 {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0}, 3112 {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
@@ -3152,6 +3153,7 @@ static struct hda_verb alc260_hp_init_verbs[] = {
3152 {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))}, 3153 {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
3153 { } 3154 { }
3154}; 3155};
3156#endif
3155 3157
3156static struct hda_verb alc260_hp_3013_init_verbs[] = { 3158static struct hda_verb alc260_hp_3013_init_verbs[] = {
3157 /* Line out and output */ 3159 /* Line out and output */
@@ -3867,7 +3869,7 @@ static struct alc_config_preset alc260_presets[] = {
3867 .mixers = { alc260_base_output_mixer, 3869 .mixers = { alc260_base_output_mixer,
3868 alc260_input_mixer, 3870 alc260_input_mixer,
3869 alc260_capture_alt_mixer }, 3871 alc260_capture_alt_mixer },
3870 .init_verbs = { alc260_hp_init_verbs }, 3872 .init_verbs = { alc260_init_verbs },
3871 .num_dacs = ARRAY_SIZE(alc260_dac_nids), 3873 .num_dacs = ARRAY_SIZE(alc260_dac_nids),
3872 .dac_nids = alc260_dac_nids, 3874 .dac_nids = alc260_dac_nids,
3873 .num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids), 3875 .num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids),