---

yaml --- r: 353079 b: refs/heads/master c: 985803c h: refs/heads/master i: 353077: 9e332cd 353075: 7ab8728 353071: c662561 v: v3
git-mirror · Jan 12, 2013 · 102697a · 102697a
1 parent 53eef05
commit 102697a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e03e9528d1cc15edf037c8e2ee0ae6499b0e59d
+refs/heads/master: 985803ca91c3039afd15a2fd32a9ef5771652cee
diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c
@@ -463,7 +463,7 @@ static void activate_amp(struct hda_codec *codec, hda_nid_t nid, int dir,
 {
 	int val;
 	if (is_ctl_associated(codec, nid, dir, idx) ||
-	    is_active_nid(codec, nid, dir, idx))
+	    (!enable && is_active_nid(codec, nid, dir, idx)))
 		return;
 	val = get_amp_val_to_activate(codec, nid, dir, enable);
 	snd_hda_codec_amp_stereo(codec, nid, dir, idx, 0xff, val);