tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Takashi Iwai 1082c748 320dcc30

+3 -3
unified split
+3 -3
sound/pci/hda/patch_realtek.c
··· 952 tmp | 0x2010); 953 break; 954 case 0x10ec0888: 955 - alc888_coef_init(codec); 956 break; 957 case 0x10ec0267: 958 case 0x10ec0268: ··· 2439 unsigned int i; 2440 2441 alc_fix_pll(codec); 2442 2443 for (i = 0; i < spec->num_init_verbs; i++) 2444 snd_hda_sequence_write(codec, spec->init_verbs[i]); ··· 8428 codec->patch_ops = alc_patch_ops; 8429 if (board_config == ALC883_AUTO) 8430 spec->init_hook = alc883_auto_init; 8431 - else if (codec->vendor_id == 0x10ec0888) 8432 - spec->init_hook = alc888_coef_init; 8433 8434 #ifdef CONFIG_SND_HDA_POWER_SAVE 8435 if (!spec->loopback.amplist)
··· 952 tmp | 0x2010); 953 break; 954 case 0x10ec0888: 955 + /*alc888_coef_init(codec);*/ /* called in alc_init() */ 956 break; 957 case 0x10ec0267: 958 case 0x10ec0268: ··· 2439 unsigned int i; 2440 2441 alc_fix_pll(codec); 2442 + if (codec->vendor_id == 0x10ec0888) 2443 + alc888_coef_init(codec); 2444 2445 for (i = 0; i < spec->num_init_verbs; i++) 2446 snd_hda_sequence_write(codec, spec->init_verbs[i]); ··· 8426 codec->patch_ops = alc_patch_ops; 8427 if (board_config == ALC883_AUTO) 8428 spec->init_hook = alc883_auto_init; 8429 8430 #ifdef CONFIG_SND_HDA_POWER_SAVE 8431 if (!spec->loopback.amplist)