diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-08-22 09:24:22 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-08-22 09:34:52 -0400 |
commit | 1082c7487cbe5a40755ba9e33552b6ecbf419bf2 (patch) | |
tree | 8b46605a66718d199cb1449c936e73ae0bd460d6 | |
parent | 320dcc30f498e0a8b282b14cf0feed1897ea3b34 (diff) |
ALSA: hda - Fix call of alc888_coef_init()
Using init_hook to call alc888_coef_init() is problematic for configurations
that already set another init_hook. Better to put it in alc_init() as is
(although it looks a bit hackish).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b80e725432f0..909f1c101c95 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -952,7 +952,7 @@ do_sku: | |||
952 | tmp | 0x2010); | 952 | tmp | 0x2010); |
953 | break; | 953 | break; |
954 | case 0x10ec0888: | 954 | case 0x10ec0888: |
955 | alc888_coef_init(codec); | 955 | /*alc888_coef_init(codec);*/ /* called in alc_init() */ |
956 | break; | 956 | break; |
957 | case 0x10ec0267: | 957 | case 0x10ec0267: |
958 | case 0x10ec0268: | 958 | case 0x10ec0268: |
@@ -2439,6 +2439,8 @@ static int alc_init(struct hda_codec *codec) | |||
2439 | unsigned int i; | 2439 | unsigned int i; |
2440 | 2440 | ||
2441 | alc_fix_pll(codec); | 2441 | alc_fix_pll(codec); |
2442 | if (codec->vendor_id == 0x10ec0888) | ||
2443 | alc888_coef_init(codec); | ||
2442 | 2444 | ||
2443 | for (i = 0; i < spec->num_init_verbs; i++) | 2445 | for (i = 0; i < spec->num_init_verbs; i++) |
2444 | snd_hda_sequence_write(codec, spec->init_verbs[i]); | 2446 | snd_hda_sequence_write(codec, spec->init_verbs[i]); |
@@ -8426,8 +8428,6 @@ static int patch_alc883(struct hda_codec *codec) | |||
8426 | codec->patch_ops = alc_patch_ops; | 8428 | codec->patch_ops = alc_patch_ops; |
8427 | if (board_config == ALC883_AUTO) | 8429 | if (board_config == ALC883_AUTO) |
8428 | spec->init_hook = alc883_auto_init; | 8430 | spec->init_hook = alc883_auto_init; |
8429 | else if (codec->vendor_id == 0x10ec0888) | ||
8430 | spec->init_hook = alc888_coef_init; | ||
8431 | 8431 | ||
8432 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 8432 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
8433 | if (!spec->loopback.amplist) | 8433 | if (!spec->loopback.amplist) |