svn commit: r204532 - stable/8/sys/dev/sound/pci/hda

[Alexander Motin]

Author: mav
Date: Mon Mar  1 19:43:26 2010
New Revision: 204532
URL: http://svn.freebsd.org/changeset/base/204532

Log:
  MFC r204351:
  Fix bug in headphones audio redirection using separate DAC. It was exposed
  by removing channel duplication during multichannel audio implementation.

Modified:
  stable/8/sys/dev/sound/pci/hda/hdac.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/dev/sound/pci/hda/hdac.c
==============================================================================
--- stable/8/sys/dev/sound/pci/hda/hdac.c	Mon Mar  1 19:36:19 2010	(r204531)
+++ stable/8/sys/dev/sound/pci/hda/hdac.c	Mon Mar  1 19:43:26 2010	(r204532)
@@ -86,7 +86,7 @@
 
 #include "mixer_if.h"
 
-#define HDA_DRV_TEST_REV	"20100122_0141"
+#define HDA_DRV_TEST_REV	"20100226_0142"
 
 SND_DECLARE_FILE("$FreeBSD$");
 
@@ -3503,7 +3503,7 @@ hdac_stream_setup(struct hdac_chan *ch)
 
 		/* If HP redirection is enabled, but failed to use same
 		   DAC, make last DAC to duplicate first one. */
-		if (as->hpredir >= 0 && i == as->pincnt) {
+		if (as->fakeredir && i == (as->pincnt - 1)) {
 			c = (ch->sid << 4);
 		} else {
 			if (map >= 0) /* Map known speaker setups. */