From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 18 Dec 2012 13:57:09 +0000 (+0100)
Subject: ALSA: hda/realtek - Handle vmaster hook in the parser side
X-Git-Tag: next-20130218~63^2~62^2~157
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3bd7b644d049feb8df4225492689a324963f42f4;p=karo-tx-linux.git

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>
---

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index f10018b732f3..a3046144f149 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1687,6 +1687,8 @@ static int __alc_build_controls(struct hda_codec *codec)
 					    true, &spec->vmaster_mute.sw_kctl);
 		if (err < 0)
 			return err;
+		if (spec->vmaster_mute.hook)
+			snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute, true);
 	}
 
 	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);
 	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);
 
 	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)
 {
 	struct alc_spec *spec = codec->spec;
-	switch (action) {
-	case ALC_FIXUP_ACT_BUILD:
+	if (action == ALC_FIXUP_ACT_PROBE)
 		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 */
@@ -6048,15 +6046,8 @@ static void alc269_fixup_mic2_mute(struct hda_codec *codec,
 				   const struct alc_fixup *fix, int action)
 {
 	struct alc_spec *spec = codec->spec;
-	switch (action) {
-	case ALC_FIXUP_ACT_BUILD:
+	if (action == ALC_FIXUP_ACT_PROBE)
 		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,