summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-05-17 17:17:43 +0200
committerJaroslav Kysela <perex@suse.cz>2006-06-22 21:33:46 +0200
commit474167d646cb2147b9fcd7bacf5cdf8177ed43c4 (patch)
tree8b2c6b202b6f419d6e4c9db6beedf679f47b467e /sound
parent[ALSA] Remove zero-initialization of static variables (diff)
downloadlinux-474167d646cb2147b9fcd7bacf5cdf8177ed43c4.tar.xz
linux-474167d646cb2147b9fcd7bacf5cdf8177ed43c4.zip
[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[] = {
{ }
};
+#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),