Skip to content

Commit

Permalink
ALSA: hda/realtek - Call alc_auto_parse_customize_define() always aft…
Browse files Browse the repository at this point in the history
…er fixup

The call for alc_auto_parse_customize_define() must be done after the
fixup pre-probe initialization.  Otherwise SKU_IGNORE fixup won't work
properly (e.g. HP RP5800 with ALC662 codec).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed May 8, 2012
1 parent 42eb923 commit af741c1
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -5641,13 +5641,13 @@ static int patch_alc262(struct hda_codec *codec)
snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PROC_COEF, tmp | 0x80);
}
#endif
alc_auto_parse_customize_define(codec);

alc_fix_pll_init(codec, 0x20, 0x0a, 10);

alc_pick_fixup(codec, NULL, alc262_fixup_tbl, alc262_fixups);
alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);

alc_auto_parse_customize_define(codec);

/* automatic parse from the BIOS config */
err = alc262_parse_auto_config(codec);
if (err < 0)
Expand Down Expand Up @@ -6252,8 +6252,6 @@ static int patch_alc269(struct hda_codec *codec)

spec->mixer_nid = 0x0b;

alc_auto_parse_customize_define(codec);

err = alc_codec_rename_from_preset(codec);
if (err < 0)
goto error;
Expand Down Expand Up @@ -6286,6 +6284,8 @@ static int patch_alc269(struct hda_codec *codec)
alc269_fixup_tbl, alc269_fixups);
alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);

alc_auto_parse_customize_define(codec);

/* automatic parse from the BIOS config */
err = alc269_parse_auto_config(codec);
if (err < 0)
Expand Down Expand Up @@ -6862,8 +6862,6 @@ static int patch_alc662(struct hda_codec *codec)
/* handle multiple HPs as is */
spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP;

alc_auto_parse_customize_define(codec);

alc_fix_pll_init(codec, 0x20, 0x04, 15);

err = alc_codec_rename_from_preset(codec);
Expand All @@ -6880,6 +6878,9 @@ static int patch_alc662(struct hda_codec *codec)
alc_pick_fixup(codec, alc662_fixup_models,
alc662_fixup_tbl, alc662_fixups);
alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);

alc_auto_parse_customize_define(codec);

/* automatic parse from the BIOS config */
err = alc662_parse_auto_config(codec);
if (err < 0)
Expand Down

0 comments on commit af741c1

Please sign in to comment.