From 102697a9cad129bcb9ff5bc1217b98495d160031 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 3 Jan 2013 16:30:04 +0100 Subject: [PATCH] --- yaml --- r: 353079 b: refs/heads/master c: 985803ca91c3039afd15a2fd32a9ef5771652cee h: refs/heads/master i: 353077: 9e332cd39c6433aa1da7b956cf0486f5a3f505c1 353075: 7ab8728598984e9335d64d5b2015cf539f0919a2 353071: c6625614150f81810af2db829d5a17044da2e965 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_generic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3ae912967776..a58916abfc74 100644 --- 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 index 6ff4a0db74e9..9228175f0806 100644 --- 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);