Skip to content

Commit

Permalink
ALSA: hda - Fix call of alc888_coef_init()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Iwai committed Aug 22, 2008
1 parent 320dcc3 commit 1082c74
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ static void alc_subsystem_id(struct hda_codec *codec,
tmp | 0x2010);
break;
case 0x10ec0888:
alc888_coef_init(codec);
/*alc888_coef_init(codec);*/ /* called in alc_init() */
break;
case 0x10ec0267:
case 0x10ec0268:
Expand Down Expand Up @@ -2439,6 +2439,8 @@ static int alc_init(struct hda_codec *codec)
unsigned int i;

alc_fix_pll(codec);
if (codec->vendor_id == 0x10ec0888)
alc888_coef_init(codec);

for (i = 0; i < spec->num_init_verbs; i++)
snd_hda_sequence_write(codec, spec->init_verbs[i]);
Expand Down Expand Up @@ -8426,8 +8428,6 @@ static int patch_alc883(struct hda_codec *codec)
codec->patch_ops = alc_patch_ops;
if (board_config == ALC883_AUTO)
spec->init_hook = alc883_auto_init;
else if (codec->vendor_id == 0x10ec0888)
spec->init_hook = alc888_coef_init;

#ifdef CONFIG_SND_HDA_POWER_SAVE
if (!spec->loopback.amplist)
Expand Down

0 comments on commit 1082c74

Please sign in to comment.