diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-12-20 14:57:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-12 08:34:12 +0100 |
| commit | fd25a97a97c78e7f09b0b3069a40bf7671654366 (patch) | |
| tree | b667629e1229449ca3ce15de7e454297f70998a8 /sound/pci | |
| parent | 406b285da3a04381d46d0f5f5e53c3de0362738c (diff) | |
| download | lwn-fd25a97a97c78e7f09b0b3069a40bf7671654366.tar.gz lwn-fd25a97a97c78e7f09b0b3069a40bf7671654366.zip | |
ALSA: hda - Add spec->vmaster_mute_enum flag to generic parser
Add a flag to indicate whether the vmaster mute hook enum is exposed
or not. Conexant codecs may want not to expose the control depending
on the model.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/hda_generic.c | 3 | ||||
| -rw-r--r-- | sound/pci/hda/hda_generic.h | 1 | ||||
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 6fb454eda97f..a5c4bc05d16f 100644 --- a/sound/pci/hda/hda_generic.c +++ b/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/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index b59889911937..a406cd4cf072 100644 --- a/sound/pci/hda/hda_generic.h +++ b/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/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index a6547570c854..fee21625e509 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/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, |