At Wed, 1 Feb 2012 12:05:41 +0100, David Henningsson wrote:

This typo caused the wrong codec's nid to be checked for wcaps type. As a result, sometimes speakers would duplicate the output sent to HDMI output.

Cc: stable@kernel.org BugLink: https://bugs.launchpad.net/bugs/924320 Signed-off-by: David Henningsson david.henningsson@canonical.com

Oh, thanks for spotting out! Applied it now.

Takashi

---

sound/pci/hda/hda_codec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 4df72c0..c2c65f6 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -1447,7 +1447,7 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, for (i = 0; i < c->cvt_setups.used; i++) { p = snd_array_elem(&c->cvt_setups, i); if (!p->active && p->stream_tag == stream_tag &&

• 	    get_wcaps_type(get_wcaps(codec, p->nid)) == type)
  

• 	    get_wcaps_type(get_wcaps(c, p->nid)) == type)
  	p->dirty = 1;
  

  } }

-- 1.7.8.3