From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 10 Jan 2013 16:14:29 +0000 (+0100)
Subject: ALSA: hda/realtek - Fix the timing for some fixups
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9bb1f06fe0844b742ab97326b34229bc8290c9c6;p=openwrt%2Fstaging%2Fblogic.git

ALSA: hda/realtek - Fix the timing for some fixups

Some fixups such as setting the flags influencing on the parser
behavior should be applied before actually parsing the tree.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 42fc05c3fdf6..eb889d2e94ee 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2666,7 +2666,7 @@ static void alc269_fixup_mic1_mute(struct hda_codec *codec,
 				   const struct hda_fixup *fix, int action)
 {
 	struct alc_spec *spec = codec->spec;
-	if (action == HDA_FIXUP_ACT_PROBE) {
+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {
 		spec->gen.vmaster_mute.hook = alc269_fixup_mic1_mute_hook;
 		spec->gen.vmaster_mute_enum = 1;
 	}
@@ -2684,7 +2684,7 @@ static void alc269_fixup_mic2_mute(struct hda_codec *codec,
 				   const struct hda_fixup *fix, int action)
 {
 	struct alc_spec *spec = codec->spec;
-	if (action == HDA_FIXUP_ACT_PROBE) {
+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {
 		spec->gen.vmaster_mute.hook = alc269_fixup_mic2_mute_hook;
 		spec->gen.vmaster_mute_enum = 1;
 	}
@@ -3373,7 +3373,7 @@ static int alc662_parse_auto_config(struct hda_codec *codec)
 static void alc272_fixup_mario(struct hda_codec *codec,
 			       const struct hda_fixup *fix, int action)
 {
-	if (action != HDA_FIXUP_ACT_PROBE)
+	if (action != HDA_FIXUP_ACT_PRE_PROBE)
 		return;
 	if (snd_hda_override_amp_caps(codec, 0x2, HDA_OUTPUT,
 				      (0x3b << AC_AMPCAP_OFFSET_SHIFT) |