diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-06-19 06:11:16 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-07-20 05:11:29 -0400 |
commit | 8c87286fdcb67f796cc9477a9bc1a2f1e173d99f (patch) | |
tree | 06c160dbc243c11f6bf387f08a7982a8a06f13f4 /sound/pci | |
parent | a18519e1e4783628182743e6cca5f9dfa6a9e3bd (diff) |
[ALSA] hda-codec - Fix ALC662 auto-configuration code
The auto-configuration code didn't initialize the verbs correctly.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index d2cadb2038da..9c5c3cfa5ec7 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -11169,12 +11169,10 @@ static int alc662_parse_auto_config(struct hda_codec *codec) | |||
11169 | 11169 | ||
11170 | if (err < 0) | 11170 | if (err < 0) |
11171 | return err; | 11171 | return err; |
11172 | else if (err > 0) | 11172 | spec->init_verbs[spec->num_init_verbs++] = alc662_auto_init_verbs; |
11173 | /* hack - override the init verbs */ | ||
11174 | spec->init_verbs[0] = alc662_auto_init_verbs; | ||
11175 | spec->mixers[spec->num_mixers] = alc662_capture_mixer; | 11173 | spec->mixers[spec->num_mixers] = alc662_capture_mixer; |
11176 | spec->num_mixers++; | 11174 | spec->num_mixers++; |
11177 | return err; | 11175 | return 1; |
11178 | } | 11176 | } |
11179 | 11177 | ||
11180 | /* additional initialization for auto-configuration model */ | 11178 | /* additional initialization for auto-configuration model */ |
@@ -11211,7 +11209,7 @@ static int patch_alc662(struct hda_codec *codec) | |||
11211 | if (err < 0) { | 11209 | if (err < 0) { |
11212 | alc_free(codec); | 11210 | alc_free(codec); |
11213 | return err; | 11211 | return err; |
11214 | } else if (err) { | 11212 | } else if (!err) { |
11215 | printk(KERN_INFO | 11213 | printk(KERN_INFO |
11216 | "hda_codec: Cannot set up configuration " | 11214 | "hda_codec: Cannot set up configuration " |
11217 | "from BIOS. Using base mode...\n"); | 11215 | "from BIOS. Using base mode...\n"); |