---

yaml --- r: 353123 b: refs/heads/master c: 9bb1f06 h: refs/heads/master i: 353121: 5bf31cd 353119: 70cfa72 v: v3
git-mirror · Jan 12, 2013 · 888caa4 · 888caa4
1 parent a009e1e
commit 888caa4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39aedee7a1cc3c72d68674ff6ff142299fa0897b
+refs/heads/master: 9bb1f06fe0844b742ab97326b34229bc8290c9c6
diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/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) |