From 888caa4670e2f648d0c9d8ba8424f2061769cdfa Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 10 Jan 2013 17:14:29 +0100 Subject: [PATCH] --- yaml --- r: 353123 b: refs/heads/master c: 9bb1f06fe0844b742ab97326b34229bc8290c9c6 h: refs/heads/master i: 353121: 5bf31cd046a87b3011fce752ddde8da86352ed8b 353119: 70cfa72f0c2620225b638eec67386c55bc625f6a v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_realtek.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0603d6919100..b247faa434b1 100644 --- 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 index 42fc05c3fdf6..eb889d2e94ee 100644 --- 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) |