From c9f11fcba3c6fd29d1e2f289cb349fddda892877 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 13 Dec 2012 17:03:30 +0100
Subject: [PATCH] --- yaml --- r: 353008 b: refs/heads/master c:
 8092e6065435d75a68873fa66cd003a1b829e0fe h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/sound/pci/hda/patch_analog.c | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 51a3f736f668..3e6a79ac7d92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9366ede7fd2c3ac7ed3a79c5d7c5ee4ad97043b8
+refs/heads/master: 8092e6065435d75a68873fa66cd003a1b829e0fe
diff --git a/trunk/sound/pci/hda/patch_analog.c b/trunk/sound/pci/hda/patch_analog.c
index 89fc5030ec79..308a5b9e6b9d 100644
--- a/trunk/sound/pci/hda/patch_analog.c
+++ b/trunk/sound/pci/hda/patch_analog.c
@@ -995,15 +995,7 @@ static int ad1986a_hp_master_sw_put(struct snd_kcontrol *kcontrol,
 				    struct snd_ctl_elem_value *ucontrol)
 {
 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-	long *valp = ucontrol->value.integer.value;
-	int change;
-
-	change = snd_hda_codec_amp_update(codec, 0x1a, 0, HDA_OUTPUT, 0,
-					  HDA_AMP_MUTE,
-					  valp[0] ? 0 : HDA_AMP_MUTE);
-	change |= snd_hda_codec_amp_update(codec, 0x1a, 1, HDA_OUTPUT, 0,
-					   HDA_AMP_MUTE,
-					   valp[1] ? 0 : HDA_AMP_MUTE);
+	int change = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);
 	if (change)
 		ad1986a_update_hp(codec);
 	return change;