]> err.no Git - linux-2.6/commitdiff
[ALSA] hda-codec - Fix init verbs for ALC260 hp model
authorTakashi Iwai <tiwai@suse.de>
Wed, 17 May 2006 15:17:43 +0000 (17:17 +0200)
committerJaroslav Kysela <perex@suse.cz>
Thu, 22 Jun 2006 19:33:46 +0000 (21:33 +0200)
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>
sound/pci/hda/patch_realtek.c

index 0fc2f77dce2c75453743dfc3e20d4a49295153ba..ceb103b93b081852a0da6759d508a1bfea9d05fc 100644 (file)
@@ -3106,6 +3106,7 @@ static struct hda_verb alc260_init_verbs[] = {
        { }
 };
 
+#if 0 /* should be identical with alc260_init_verbs? */
 static struct hda_verb alc260_hp_init_verbs[] = {
        /* Headphone and output */
        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
@@ -3152,6 +3153,7 @@ static struct hda_verb alc260_hp_init_verbs[] = {
        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
        { }
 };
+#endif
 
 static struct hda_verb alc260_hp_3013_init_verbs[] = {
        /* Line out and output */
@@ -3867,7 +3869,7 @@ static struct alc_config_preset alc260_presets[] = {
                .mixers = { alc260_base_output_mixer,
                            alc260_input_mixer,
                            alc260_capture_alt_mixer },
-               .init_verbs = { alc260_hp_init_verbs },
+               .init_verbs = { alc260_init_verbs },
                .num_dacs = ARRAY_SIZE(alc260_dac_nids),
                .dac_nids = alc260_dac_nids,
                .num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids),