openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: hda/realtek - Handle vmaster hook in the parser side 

... so that the fixup just needs to set the hook function in
FIXUP_ACT_PROBE.  This will make easier to port for other codecs,
too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-12-18 14:57:09 +01:00
parent 20c18f562a
commit 3bd7b644d0
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sound/pci/hda/patch_realtek.c
View File

@ -1687,6 +1687,8 @@ static int __alc_build_controls(struct hda_codec *codec)
true, &spec->vmaster_mute.sw_kctl); true, &spec->vmaster_mute.sw_kctl);
if (err < 0) if (err < 0)
return err; return err;
if (spec->vmaster_mute.hook)
snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute, true);
} }
alc_free_kctls(codec); /* no longer needed */ alc_free_kctls(codec); /* no longer needed */
@ -1745,6 +1747,9 @@ static int alc_init(struct hda_codec *codec)
snd_hda_gen_apply_verbs(codec); snd_hda_gen_apply_verbs(codec);
alc_auto_init_std(codec); alc_auto_init_std(codec);
if (spec->vmaster_mute.sw_kctl && spec->vmaster_mute.hook)
snd_hda_sync_vmaster_hook(&spec->vmaster_mute);
alc_apply_fixup(codec, ALC_FIXUP_ACT_INIT); alc_apply_fixup(codec, ALC_FIXUP_ACT_INIT);
hda_call_check_power_status(codec, 0x01); hda_call_check_power_status(codec, 0x01);
@ -6025,15 +6030,8 @@ static void alc269_fixup_mic1_mute(struct hda_codec *codec,
const struct alc_fixup *fix, int action) const struct alc_fixup *fix, int action)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
switch (action) { if (action == ALC_FIXUP_ACT_PROBE)
case ALC_FIXUP_ACT_BUILD:
spec->vmaster_mute.hook = alc269_fixup_mic1_mute_hook; spec->vmaster_mute.hook = alc269_fixup_mic1_mute_hook;
snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute, true);
/* fallthru */
case ALC_FIXUP_ACT_INIT:
snd_hda_sync_vmaster_hook(&spec->vmaster_mute);
break;
}
} }
/* update mute-LED according to the speaker mute state via mic2 VREF pin */ /* update mute-LED according to the speaker mute state via mic2 VREF pin */
@ -6048,15 +6046,8 @@ static void alc269_fixup_mic2_mute(struct hda_codec *codec,
const struct alc_fixup *fix, int action) const struct alc_fixup *fix, int action)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
switch (action) { if (action == ALC_FIXUP_ACT_PROBE)
case ALC_FIXUP_ACT_BUILD:
spec->vmaster_mute.hook = alc269_fixup_mic2_mute_hook; spec->vmaster_mute.hook = alc269_fixup_mic2_mute_hook;
snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute, true);
/* fallthru */
case ALC_FIXUP_ACT_INIT:
snd_hda_sync_vmaster_hook(&spec->vmaster_mute);
break;
}
} }
static void alc271_hp_gate_mic_jack(struct hda_codec *codec, static void alc271_hp_gate_mic_jack(struct hda_codec *codec,