ALSA: hda/realtek - Fix the timing for some fixups
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Jan 2013 16:14:29 +0000 (17:14 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sat, 12 Jan 2013 07:44:42 +0000 (08:44 +0100)
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>
sound/pci/hda/patch_realtek.c

index 42fc05c..eb889d2 100644 (file)
@@ -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) |