From db0013442b80ea1dc9f5ad28a1c2238f97cdf4f9 Mon Sep 17 00:00:00 2001
From: Nicolas Graziano <nicolas.graziano@wanadoo.fr>
Date: Fri, 29 Jul 2005 12:17:20 +0200
Subject: [PATCH] --- yaml --- r: 6503 b: refs/heads/master c:
 b9f5a89c74e541533766dcda55d34a06253f60f3 h: refs/heads/master i:   6501:
 3596001a9877eaf1827619abce8f0eb1b9a2253d   6499:
 4f9a21626b7b6214ba90fe8222a6628f43efb1e0   6495:
 0e4db1a14479c5fef0dc9d08009fad5092603445 v: v3

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

diff --git a/[refs] b/[refs]
index 9f57406aa955..6e744ff7f460 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d827560c96346e0b8b02c1000cc347d73488c818
+refs/heads/master: b9f5a89c74e541533766dcda55d34a06253f60f3
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
index d3ac7530ec89..026ae726d875 100644
--- a/trunk/sound/pci/hda/hda_codec.c
+++ b/trunk/sound/pci/hda/hda_codec.c
@@ -749,12 +749,14 @@ int snd_hda_mixer_amp_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 	long *valp = ucontrol->value.integer.value;
 	int change = 0;
 
-	if (chs & 1)
+	if (chs & 1) {
 		change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
 						  0x7f, *valp);
+		valp++;
+	}
 	if (chs & 2)
 		change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
-						   0x7f, valp[1]);
+						   0x7f, *valp);
 	return change;
 }
 
@@ -796,12 +798,15 @@ int snd_hda_mixer_amp_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 	long *valp = ucontrol->value.integer.value;
 	int change = 0;
 
-	if (chs & 1)
+	if (chs & 1) {
 		change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
 						  0x80, *valp ? 0 : 0x80);
+		valp++;
+	}
 	if (chs & 2)
 		change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
-						   0x80, valp[1] ? 0 : 0x80);
+						   0x80, *valp ? 0 : 0x80);
+	
 	return change;
 }