From 00ff6d9dd00ce1709790eef0b977238a740ae5a3 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 20 Dec 2012 14:57:18 +0100 Subject: [PATCH] --- yaml --- r: 353062 b: refs/heads/master c: fd25a97a97c78e7f09b0b3069a40bf7671654366 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_generic.c | 3 ++- trunk/sound/pci/hda/hda_generic.h | 1 + trunk/sound/pci/hda/patch_realtek.c | 8 ++++++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 270dd7df5ab0..575e68b1eb25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 406b285da3a04381d46d0f5f5e53c3de0362738c +refs/heads/master: fd25a97a97c78e7f09b0b3069a40bf7671654366 diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c index 6fb454eda97f..a5c4bc05d16f 100644 --- a/trunk/sound/pci/hda/hda_generic.c +++ b/trunk/sound/pci/hda/hda_generic.c @@ -2966,7 +2966,8 @@ int snd_hda_gen_build_controls(struct hda_codec *codec) if (err < 0) return err; if (spec->vmaster_mute.hook) - snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute, true); + snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute, + spec->vmaster_mute_enum); } free_kctls(spec); /* no longer needed */ diff --git a/trunk/sound/pci/hda/hda_generic.h b/trunk/sound/pci/hda/hda_generic.h index b59889911937..a406cd4cf072 100644 --- a/trunk/sound/pci/hda/hda_generic.h +++ b/trunk/sound/pci/hda/hda_generic.h @@ -151,6 +151,7 @@ struct hda_gen_spec { unsigned int multi_cap_vol:1; /* allow multiple capture xxx volumes */ unsigned int inv_dmic_split:1; /* inverted dmic w/a for conexant */ unsigned int own_eapd_ctl:1; /* set EAPD by own function */ + unsigned int vmaster_mute_enum:1; /* add vmaster mute mode enum */ /* for virtual master */ hda_nid_t vmaster_nid; diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c index a6547570c854..fee21625e509 100644 --- a/trunk/sound/pci/hda/patch_realtek.c +++ b/trunk/sound/pci/hda/patch_realtek.c @@ -2678,8 +2678,10 @@ static void alc269_fixup_mic1_mute(struct hda_codec *codec, const struct alc_fixup *fix, int action) { struct alc_spec *spec = codec->spec; - if (action == ALC_FIXUP_ACT_PROBE) + if (action == ALC_FIXUP_ACT_PROBE) { spec->gen.vmaster_mute.hook = alc269_fixup_mic1_mute_hook; + spec->gen.vmaster_mute_enum = 1; + } } /* update mute-LED according to the speaker mute state via mic2 VREF pin */ @@ -2694,8 +2696,10 @@ static void alc269_fixup_mic2_mute(struct hda_codec *codec, const struct alc_fixup *fix, int action) { struct alc_spec *spec = codec->spec; - if (action == ALC_FIXUP_ACT_PROBE) + if (action == ALC_FIXUP_ACT_PROBE) { spec->gen.vmaster_mute.hook = alc269_fixup_mic2_mute_hook; + spec->gen.vmaster_mute_enum = 1; + } } static void alc271_hp_gate_mic_jack(struct hda_codec *codec,