From patchwork Wed Sep 26 16:17:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Quantal, 1/1] Revert "ALSA: hda/realtek - Call alc_auto_parse_customize_define() always after fixup" From: Joseph Salisbury X-Patchwork-Id: 187122 Message-Id: <9a9344c855b09e830185dfa4c36d8d41b1765620.1347983033.git.joseph.salisbury@canonical.com> To: kernel-team@lists.ubuntu.com Date: Wed, 26 Sep 2012 12:17:36 -0400 From: Joseph Salisbury This reverts commit af741c150f66db8d1da6f82ac75e2571f7f1dd38. BugLink: http://bugs.launchpad.net/bugs/1006690 Backport required to apply this commit to Quantal. Signed-off-by: Joseph Salisbury --- sound/pci/hda/patch_realtek.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index c4c4b01..62b2206 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5596,13 +5596,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) @@ -6267,6 +6267,8 @@ static int patch_alc269(struct hda_codec *codec) struct alc_spec *spec; int err; + alc_auto_parse_customize_define(codec); + err = alc_alloc_spec(codec, 0x0b); if (err < 0) return err; @@ -6304,8 +6306,6 @@ 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) @@ -6917,6 +6917,8 @@ 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); spec->init_hook = alc662_fill_coef;